From afe0090e8d1665a4b2d8bf01be14c965b0827044 Mon Sep 17 00:00:00 2001
From: Joan Sisquella <joan.sisquella@forgeflow.com>
Date: Thu, 30 Apr 2020 15:35:09 +0200
Subject: [PATCH] [IMP] account_financial_report: select accounts between two
 codes

---
 .../wizard/aged_partner_balance_wizard.py     | 28 +++++++++++++++++
 .../aged_partner_balance_wizard_view.xml      | 15 +++++++++
 .../wizard/general_ledger_wizard.py           | 25 ++++++++++++---
 .../wizard/general_ledger_wizard_view.xml     | 31 ++++++++++++++-----
 .../wizard/open_items_wizard.py               | 27 ++++++++++++++++
 .../wizard/open_items_wizard_view.xml         | 16 ++++++++++
 .../wizard/trial_balance_wizard.py            | 21 +++++++++++++
 .../wizard/trial_balance_wizard_view.xml      | 16 ++++++++--
 8 files changed, 166 insertions(+), 13 deletions(-)

diff --git a/account_financial_report/wizard/aged_partner_balance_wizard.py b/account_financial_report/wizard/aged_partner_balance_wizard.py
index ac624f63..45206a68 100644
--- a/account_financial_report/wizard/aged_partner_balance_wizard.py
+++ b/account_financial_report/wizard/aged_partner_balance_wizard.py
@@ -40,6 +40,34 @@ class AgedPartnerBalanceWizard(models.TransientModel):
     )
     show_move_line_details = fields.Boolean()
 
+    account_code_from = fields.Many2one(
+        comodel_name='account.account',
+        string='Account Code From',
+        help='Starting account in a range')
+    account_code_to = fields.Many2one(
+        comodel_name='account.account',
+        string='Account Code To',
+        help='Ending account in a range')
+
+    @api.onchange('account_code_from', 'account_code_to')
+    def on_change_account_range(self):
+        if self.account_code_from and self.account_code_from.code.isdigit() and \
+                self.account_code_to and self.account_code_to.code.isdigit():
+            start_range = int(self.account_code_from.code)
+            end_range = int(self.account_code_to.code)
+            self.account_ids = self.env['account.account'].search([
+                ('code', 'in', [
+                    x for x in range(start_range, end_range + 1)]),
+                ('reconcile', '=', True)
+            ])
+            if self.company_id:
+                self.account_ids = self.account_ids.filtered(
+                    lambda a: a.company_id == self.company_id)
+        return {'domain': {
+            'account_code_from': [('reconcile', '=', True)],
+            'account_code_to': [('reconcile', '=', True)]
+        }}
+
     @api.onchange('company_id')
     def onchange_company_id(self):
         """Handle company change."""
diff --git a/account_financial_report/wizard/aged_partner_balance_wizard_view.xml b/account_financial_report/wizard/aged_partner_balance_wizard_view.xml
index 7b7e8d93..684d19e1 100644
--- a/account_financial_report/wizard/aged_partner_balance_wizard_view.xml
+++ b/account_financial_report/wizard/aged_partner_balance_wizard_view.xml
@@ -29,6 +29,21 @@
                     <label for="account_ids" colspan="4"/>
                     <field name="receivable_accounts_only"/>
                     <field name="payable_accounts_only"/>
+                    <label for="account_code_from" string="From Code"/>
+                    <div>
+                        <div class="o_row">
+                            <field name="account_code_from"
+                                   class="oe_inline"
+                                   options="{'no_create': True}"/>
+                            <span class="oe_inline">
+                                To
+                            </span>
+                            <field name="account_code_to"
+                                   class="oe_inline"
+                                   options="{'no_create': True}"
+                            />
+                        </div>
+                    </div>
                     <field name="account_ids" nolabel="1"
                            widget="many2many_tags"
                            options="{'no_create': True}"
diff --git a/account_financial_report/wizard/general_ledger_wizard.py b/account_financial_report/wizard/general_ledger_wizard.py
index a0e5c73b..4c409864 100644
--- a/account_financial_report/wizard/general_ledger_wizard.py
+++ b/account_financial_report/wizard/general_ledger_wizard.py
@@ -89,10 +89,27 @@ class GeneralLedgerReportWizard(models.TransientModel):
              'will display initial and final balance in that currency.',
         default=lambda self: self._default_foreign_currency(),
     )
-    partner_ungrouped = fields.Boolean(
-        string='Partner ungrouped',
-        help='If set moves are not grouped by partner in any case'
-    )
+    account_code_from = fields.Many2one(
+        comodel_name='account.account',
+        string='Account Code From',
+        help='Starting account in a range')
+    account_code_to = fields.Many2one(
+        comodel_name='account.account',
+        string='Account Code To',
+        help='Ending account in a range')
+
+    @api.onchange('account_code_from', 'account_code_to')
+    def on_change_account_range(self):
+        if self.account_code_from and self.account_code_from.code.isdigit() and \
+                self.account_code_to and self.account_code_to.code.isdigit():
+            start_range = int(self.account_code_from.code)
+            end_range = int(self.account_code_to.code)
+            self.account_ids = self.env['account.account'].search(
+                [('code', 'in', [
+                    x for x in range(start_range, end_range + 1)])])
+            if self.company_id:
+                self.account_ids = self.account_ids.filtered(
+                    lambda a: a.company_id == self.company_id)
 
     def _init_date_from(self):
         """set start date to begin of current year if fiscal year running"""
diff --git a/account_financial_report/wizard/general_ledger_wizard_view.xml b/account_financial_report/wizard/general_ledger_wizard_view.xml
index d7569e28..31de94fc 100644
--- a/account_financial_report/wizard/general_ledger_wizard_view.xml
+++ b/account_financial_report/wizard/general_ledger_wizard_view.xml
@@ -49,13 +49,30 @@
                     </group>
                     <notebook>
                         <page string="Filter accounts">
-                            <group>
-                                <group>
-                                    <field name="account_type_ids" widget="many2many_checkboxes" nolabel="1"/>
-                                </group>
-                                <group>
-                                    <field name="account_ids" widget="many2many_tags" options="{'no_create': True}" nolabel="1"/>
-                                </group>
+                            <group name="account_filter" col="4">
+                                <label for="account_ids" colspan="4"/>
+                                <field name="receivable_accounts_only"/>
+                                <field name="payable_accounts_only"/>
+                                <label for="account_code_from"
+                                       string="From Code"/>
+                                <div>
+                                    <div class="o_row">
+                                        <field name="account_code_from"
+                                               class="oe_inline"
+                                               options="{'no_create': True}"/>
+                                        <span class="oe_inline">
+                                            To
+                                        </span>
+                                        <field name="account_code_to"
+                                               class="oe_inline"
+                                               options="{'no_create': True}"
+                                        />
+                                    </div>
+                                </div>
+                                <field name="account_ids" nolabel="1"
+                                       widget="many2many_tags"
+                                       options="{'no_create': True}"
+                                       colspan="4"/>
                             </group>
                         </page>
                         <page string="Filter partners">
diff --git a/account_financial_report/wizard/open_items_wizard.py b/account_financial_report/wizard/open_items_wizard.py
index 5d6b8f84..67e0e6dd 100644
--- a/account_financial_report/wizard/open_items_wizard.py
+++ b/account_financial_report/wizard/open_items_wizard.py
@@ -58,6 +58,33 @@ class OpenItemsReportWizard(models.TransientModel):
         string='Show Partner Details',
         default=True,
     )
+    account_code_from = fields.Many2one(
+        comodel_name='account.account',
+        string='Account Code From',
+        help='Starting account in a range')
+    account_code_to = fields.Many2one(
+        comodel_name='account.account',
+        string='Account Code To',
+        help='Ending account in a range')
+
+    @api.onchange('account_code_from', 'account_code_to')
+    def on_change_account_range(self):
+        if self.account_code_from and self.account_code_from.code.isdigit() and \
+                self.account_code_to and self.account_code_to.code.isdigit():
+            start_range = int(self.account_code_from.code)
+            end_range = int(self.account_code_to.code)
+            self.account_ids = self.env['account.account'].search([
+                ('code', 'in', [
+                    x for x in range(start_range, end_range + 1)]),
+                ('reconcile', '=', True)
+            ])
+            if self.company_id:
+                self.account_ids = self.account_ids.filtered(
+                    lambda a: a.company_id == self.company_id)
+        return {'domain': {
+            'account_code_from': [('reconcile', '=', True)],
+            'account_code_to': [('reconcile', '=', True)]
+        }}
 
     def _default_foreign_currency(self):
         return self.env.user.has_group('base.group_multi_currency')
diff --git a/account_financial_report/wizard/open_items_wizard_view.xml b/account_financial_report/wizard/open_items_wizard_view.xml
index c773b503..9e9703b6 100644
--- a/account_financial_report/wizard/open_items_wizard_view.xml
+++ b/account_financial_report/wizard/open_items_wizard_view.xml
@@ -32,6 +32,22 @@
                 <group name="account_filter" col="4">
                     <field name="receivable_accounts_only"/>
                     <field name="payable_accounts_only"/>
+                    <label for="account_code_from" string="From Code"/>
+                    <div>
+                        <div class="o_row">
+                            <field name="account_code_from"
+                                   class="oe_inline"
+                                   options="{'no_create': True}"
+                            />
+                            <span class="oe_inline">
+                                To
+                            </span>
+                            <field name="account_code_to"
+                                   class="oe_inline"
+                                   options="{'no_create': True}"
+                            />
+                        </div>
+                    </div>
                     <field name="account_ids"
                            nolabel="1"
                            widget="many2many_tags"
diff --git a/account_financial_report/wizard/trial_balance_wizard.py b/account_financial_report/wizard/trial_balance_wizard.py
index 1f0a797f..678040d3 100644
--- a/account_financial_report/wizard/trial_balance_wizard.py
+++ b/account_financial_report/wizard/trial_balance_wizard.py
@@ -83,6 +83,27 @@ class TrialBalanceReportWizard(models.TransientModel):
              'account currency is not setup through chart of accounts '
              'will display initial and final balance in that currency.'
     )
+    account_code_from = fields.Many2one(
+        comodel_name='account.account',
+        string='Account Code From',
+        help='Starting account in a range')
+    account_code_to = fields.Many2one(
+        comodel_name='account.account',
+        string='Account Code To',
+        help='Ending account in a range')
+
+    @api.onchange('account_code_from', 'account_code_to')
+    def on_change_account_range(self):
+        if self.account_code_from and self.account_code_from.code.isdigit() and \
+                self.account_code_to and self.account_code_to.code.isdigit():
+            start_range = int(self.account_code_from.code)
+            end_range = int(self.account_code_to.code)
+            self.account_ids = self.env['account.account'].search(
+                [('code', 'in', [
+                    x for x in range(start_range, end_range + 1)])])
+            if self.company_id:
+                self.account_ids = self.account_ids.filtered(
+                    lambda a: a.company_id == self.company_id)
 
     @api.multi
     @api.constrains('hierarchy_on', 'show_hierarchy_level')
diff --git a/account_financial_report/wizard/trial_balance_wizard_view.xml b/account_financial_report/wizard/trial_balance_wizard_view.xml
index 48c6255a..ca8dbc95 100644
--- a/account_financial_report/wizard/trial_balance_wizard_view.xml
+++ b/account_financial_report/wizard/trial_balance_wizard_view.xml
@@ -48,8 +48,20 @@
                         <label for="account_ids" colspan="4"/>
                         <field name="receivable_accounts_only"/>
                         <field name="payable_accounts_only"/>
-                        <field name="account_ids"
-                               nolabel="1"
+                        <label for="account_code_from" string="From Code"/>
+                        <div>
+                            <div class="o_row">
+                                <field name="account_code_from"
+                                       class="oe_inline"
+                                       options="{'no_create': True}"/>
+                                <span class="oe_inline">To</span>
+                                <field name="account_code_to"
+                                       class="oe_inline"
+                                       options="{'no_create': True}"
+                                />
+                            </div>
+                        </div>
+                        <field name="account_ids" nolabel="1"
                                widget="many2many_tags"
                                options="{'no_create': True}"
                                colspan="4"/>