odoo-addon-account-financial-report 15.0.1.1.0.1__py3-none-any.whl → 18.0.1.4.4.3__py3-none-any.whl

odoo/addons/account_financial_report/view/res_config_settings_views.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- Copyright 2023 Tecnativa - Carolina Fernandez
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <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[@id='analytic']" position="after">
+                <block
+                    title="OCA Aged Report Configuration"
+                    id="oca_aged_report_config"
+                >
+                    <div
+                        id="main_oca_aged_report_config"
+                        class="col-12 col-lg-12 o_setting_box"
+                    >
+                        <div class="o_setting_left_pane" />
+                        <div class="o_setting_right_pane">
+                            <span class="o_form_label">Intervals configuration</span>
+                            <div class="text-muted">
+                                Here you can set the intervals that will appear on the Aged Partner Balance.
+                            </div>
+                            <div class="content-group">
+                                <div class="row mt16">
+                                    <label
+                                        for="age_partner_config_id"
+                                        class="col-lg-3 o_light_label"
+                                    />
+                                    <field
+                                        name="age_partner_config_id"
+                                        options="{'no_create_edit': True, 'no_open': True}"
+                                    />
+                                </div>
+                                <div class="mt8">
+                                    <button
+                                        type="action"
+                                        name="%(account_financial_report.action_aged_partner_report_configuration)d"
+                                        string="Configurations"
+                                        class="btn-link"
+                                        icon="fa-arrow-right"
+                                    />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </block>
+            </xpath>
+        </field>
+    </record>
+</odoo>

odoo/addons/account_financial_report/wizard/abstract_wizard.py

@@ -34,18 +34,41 @@ class AbstractWizard(models.AbstractModel):
         required=False,
         string="Company",
     )
+    label_text_limit = fields.Integer(default=40)
 
     def button_export_html(self):
         self.ensure_one()
+        self._set_default_wizard_values()
         report_type = "qweb-html"
         return self._export(report_type)
 
     def button_export_pdf(self):
         self.ensure_one()
+        self._set_default_wizard_values()
         report_type = "qweb-pdf"
         return self._export(report_type)
 
     def button_export_xlsx(self):
         self.ensure_one()
+        self._set_default_wizard_values()
         report_type = "xlsx"
         return self._export(report_type)
+
+    def _limit_text(self, value, limit_field="label_text_limit"):
+        limit = self[limit_field]
+        if value and limit and len(value) > limit:
+            value = value[:limit] + "..."
+        return value
+
+    def _prepare_report_data(self):
+        self.ensure_one()
+        return {"wizard_name": self._name, "wizard_id": self.id}
+
+    def _set_default_wizard_values(self):
+        self.env["ir.default"].sudo().set(
+            self._name,
+            "label_text_limit",
+            self.label_text_limit,
+            user_id=False,
+            company_id=True,
+        )

odoo/addons/account_financial_report/wizard/aged_partner_balance_wizard.py

@@ -40,6 +40,9 @@ class AgedPartnerBalanceWizard(models.TransientModel):
         comodel_name="account.account",
         help="Ending account in a range",
     )
+    age_partner_config_id = fields.Many2one(
+        "account.age.report.configuration", string="Intervals configuration"
+    )
 
     @api.onchange("account_code_from", "account_code_to")
     def on_change_account_range(self):
@@ -60,7 +63,7 @@ class AgedPartnerBalanceWizard(models.TransientModel):
             )
             if self.company_id:
                 self.account_ids = self.account_ids.filtered(
-                    lambda a: a.company_id == self.company_id
+                    lambda a: self.company_id in a.company_ids
                 )
         return {
             "domain": {
@@ -81,13 +84,15 @@ class AgedPartnerBalanceWizard(models.TransientModel):
                 self.onchange_type_accounts_only()
             else:
                 self.account_ids = self.account_ids.filtered(
-                    lambda a: a.company_id == self.company_id
+                    lambda a: self.company_id in a.company_ids
                 )
         res = {"domain": {"account_ids": [], "partner_ids": []}}
         if not self.company_id:
             return res
         else:
-            res["domain"]["account_ids"] += [("company_id", "=", self.company_id.id)]
+            res["domain"]["account_ids"] += [
+                ("company_ids", "in", [self.company_id.id])
+            ]
             res["domain"]["partner_ids"] += self._get_partner_ids_domain()
         return res
 
@@ -98,21 +103,23 @@ class AgedPartnerBalanceWizard(models.TransientModel):
     @api.onchange("receivable_accounts_only", "payable_accounts_only")
     def onchange_type_accounts_only(self):
         """Handle receivable/payable accounts only change."""
-        domain = [("company_id", "=", self.company_id.id)]
+        domain = [("company_ids", "in", [self.company_id.id])]
         if self.receivable_accounts_only or self.payable_accounts_only:
             if self.receivable_accounts_only and self.payable_accounts_only:
-                domain += [("internal_type", "in", ("receivable", "payable"))]
+                domain += [
+                    ("account_type", "in", ("asset_receivable", "liability_payable"))
+                ]
             elif self.receivable_accounts_only:
-                domain += [("internal_type", "=", "receivable")]
+                domain += [("account_type", "=", "asset_receivable")]
             elif self.payable_accounts_only:
-                domain += [("internal_type", "=", "payable")]
+                domain += [("account_type", "=", "liability_payable")]
             self.account_ids = self.env["account.account"].search(domain)
         else:
             self.account_ids = None
 
     def _print_report(self, report_type):
         self.ensure_one()
-        data = self._prepare_report_aged_partner_balance()
+        data = self._prepare_report_data()
         if report_type == "xlsx":
             report_name = "a_f_r.report_aged_partner_balance_xlsx"
         else:
@@ -127,6 +134,7 @@ class AgedPartnerBalanceWizard(models.TransientModel):
         )
 
     def _prepare_report_aged_partner_balance(self):
+        # TODO: Kept for compatibility - To be merged into _prepare_report_data in 19
         self.ensure_one()
         return {
             "wizard_id": self.id,
@@ -138,8 +146,14 @@ class AgedPartnerBalanceWizard(models.TransientModel):
             "partner_ids": self.partner_ids.ids,
             "show_move_line_details": self.show_move_line_details,
             "account_financial_report_lang": self.env.lang,
+            "age_partner_config_id": self.age_partner_config_id.id,
         }
 
+    def _prepare_report_data(self):
+        res = super()._prepare_report_data()
+        res.update(self._prepare_report_aged_partner_balance())
+        return res
+
     def _export(self, report_type):
         """Default export is PDF."""
         return self._print_report(report_type)

odoo/addons/account_financial_report/wizard/aged_partner_balance_wizard_view.xml

@@ -33,6 +33,8 @@
                     />
                 </group>
                 <group name="account_filter" col="4">
+                    <label for="age_partner_config_id" />
+                    <field name="age_partner_config_id" nolabel="1" />
                     <label for="account_ids" colspan="4" />
                     <field name="receivable_accounts_only" />
                     <field name="payable_accounts_only" />
@@ -68,19 +70,16 @@
                         default_focus="1"
                         class="oe_highlight"
                     />
-                    or
                     <button
                         name="button_export_pdf"
                         string="Export PDF"
                         type="object"
                     />
-                    or
                     <button
                         name="button_export_xlsx"
                         string="Export XLSX"
                         type="object"
                     />
-                    or
                     <button string="Cancel" class="oe_link" special="cancel" />
                 </footer>
             </form>

odoo/addons/account_financial_report/wizard/general_ledger_wizard.py

@@ -10,7 +10,7 @@
 import time
 from ast import literal_eval
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import ValidationError
 from odoo.tools import date_utils
 
@@ -43,7 +43,6 @@ class GeneralLedgerReportWizard(models.TransientModel):
         "If partners are filtered, "
         "debits and credits totals will not match the trial balance.",
     )
-    show_analytic_tags = fields.Boolean()
     receivable_accounts_only = fields.Boolean()
     payable_accounts_only = fields.Boolean()
     partner_ids = fields.Many2many(
@@ -51,17 +50,16 @@ class GeneralLedgerReportWizard(models.TransientModel):
         string="Filter partners",
         default=lambda self: self._default_partners(),
     )
-    analytic_tag_ids = fields.Many2many(
-        comodel_name="account.analytic.tag", string="Filter analytic tags"
-    )
     account_journal_ids = fields.Many2many(
         comodel_name="account.journal", string="Filter journals"
     )
     cost_center_ids = fields.Many2many(
         comodel_name="account.analytic.account", string="Filter cost centers"
     )
-
-    not_only_one_unaffected_earnings_account = fields.Boolean(readonly=True)
+    only_one_unaffected_earnings_account = fields.Boolean(
+        readonly=True,
+        default=lambda self: self._only_one_unaffected_earnings_account(),
+    )
     foreign_currency = fields.Boolean(
         string="Show foreign currency",
         help="Display foreign currency for move lines, unless "
@@ -77,8 +75,10 @@ class GeneralLedgerReportWizard(models.TransientModel):
         comodel_name="account.account",
         help="Ending account in a range",
     )
-    show_partner_details = fields.Boolean(
-        default=True,
+    grouped_by = fields.Selection(
+        selection=[("none", "None"), ("partners", "Partners"), ("taxes", "Taxes")],
+        default="partners",
+        required=True,
     )
     show_cost_center = fields.Boolean(
         string="Show Analytic Account",
@@ -104,13 +104,10 @@ class GeneralLedgerReportWizard(models.TransientModel):
         ):
             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", ">=", start_range), ("code", "<=", end_range)]
-            )
+            domain = [("code", ">=", start_range), ("code", "<=", end_range)]
             if self.company_id:
-                self.account_ids = self.account_ids.filtered(
-                    lambda a: a.company_id == self.company_id
-                )
+                domain.append(("company_ids", "in", self.company_id.ids))
+            self.account_ids = self.env["account.account"].search(domain)
 
     def _init_date_from(self):
         """set start date to begin of current year if fiscal year running"""
@@ -144,17 +141,21 @@ class GeneralLedgerReportWizard(models.TransientModel):
             else:
                 wiz.fy_start_date = False
 
-    @api.onchange("company_id")
-    def onchange_company_id(self):
-        """Handle company change."""
-        account_type = self.env.ref("account.data_unaffected_earnings")
+    def _only_one_unaffected_earnings_account(self):
         count = self.env["account.account"].search_count(
             [
-                ("user_type_id", "=", account_type.id),
-                ("company_id", "=", self.company_id.id),
+                ("account_type", "=", "equity_unaffected"),
+                ("company_ids", "in", [self.company_id.id or self.env.company.id]),
             ]
         )
-        self.not_only_one_unaffected_earnings_account = count != 1
+        return count == 1
+
+    @api.onchange("company_id")
+    def onchange_company_id(self):
+        """Handle company change."""
+        self.only_one_unaffected_earnings_account = (
+            self._only_one_unaffected_earnings_account()
+        )
         if (
             self.company_id
             and self.date_range_id.company_id
@@ -174,7 +175,7 @@ class GeneralLedgerReportWizard(models.TransientModel):
                 self.onchange_type_accounts_only()
             else:
                 self.account_ids = self.account_ids.filtered(
-                    lambda a: a.company_id == self.company_id
+                    lambda a: self.company_id in a.company_ids
                 )
         if self.company_id and self.cost_center_ids:
             self.cost_center_ids = self.cost_center_ids.filtered(
@@ -192,7 +193,7 @@ class GeneralLedgerReportWizard(models.TransientModel):
         if not self.company_id:
             return res
         else:
-            res["domain"]["account_ids"] += [("company_id", "=", self.company_id.id)]
+            res["domain"]["account_ids"] += [("company_ids", "in", self.company_id.ids)]
             res["domain"]["account_journal_ids"] += [
                 ("company_id", "=", self.company_id.id)
             ]
@@ -223,7 +224,7 @@ class GeneralLedgerReportWizard(models.TransientModel):
                 and rec.company_id != rec.date_range_id.company_id
             ):
                 raise ValidationError(
-                    _(
+                    self.env._(
                         "The Company in the General Ledger Report Wizard and in "
                         "Date Range must be the same."
                     )
@@ -233,13 +234,15 @@ class GeneralLedgerReportWizard(models.TransientModel):
     def onchange_type_accounts_only(self):
         """Handle receivable/payable accounts only change."""
         if self.receivable_accounts_only or self.payable_accounts_only:
-            domain = [("company_id", "=", self.company_id.id)]
+            domain = [("company_ids", "in", [self.company_id.id])]
             if self.receivable_accounts_only and self.payable_accounts_only:
-                domain += [("internal_type", "in", ("receivable", "payable"))]
+                domain += [
+                    ("account_type", "in", ("asset_receivable", "liability_payable"))
+                ]
             elif self.receivable_accounts_only:
-                domain += [("internal_type", "=", "receivable")]
+                domain += [("account_type", "=", "asset_receivable")]
             elif self.payable_accounts_only:
-                domain += [("internal_type", "=", "payable")]
+                domain += [("account_type", "=", "liability_payable")]
             self.account_ids = self.env["account.account"].search(domain)
         else:
             self.account_ids = None
@@ -254,12 +257,11 @@ class GeneralLedgerReportWizard(models.TransientModel):
 
     @api.depends("company_id")
     def _compute_unaffected_earnings_account(self):
-        account_type = self.env.ref("account.data_unaffected_earnings")
         for record in self:
             record.unaffected_earnings_account = self.env["account.account"].search(
                 [
-                    ("user_type_id", "=", account_type.id),
-                    ("company_id", "=", record.company_id.id),
+                    ("account_type", "=", "equity_unaffected"),
+                    ("company_ids", "in", [record.company_id.id]),
                 ]
             )
 
@@ -271,7 +273,7 @@ class GeneralLedgerReportWizard(models.TransientModel):
 
     def _print_report(self, report_type):
         self.ensure_one()
-        data = self._prepare_report_general_ledger()
+        data = self._prepare_report_data()
         if report_type == "xlsx":
             report_name = "a_f_r.report_general_ledger_xlsx"
         else:
@@ -286,6 +288,7 @@ class GeneralLedgerReportWizard(models.TransientModel):
         )
 
     def _prepare_report_general_ledger(self):
+        # TODO: Kept for compatibility - To be merged into _prepare_report_data in 19
         self.ensure_one()
         return {
             "wizard_id": self.id,
@@ -294,14 +297,12 @@ class GeneralLedgerReportWizard(models.TransientModel):
             "only_posted_moves": self.target_move == "posted",
             "hide_account_at_0": self.hide_account_at_0,
             "foreign_currency": self.foreign_currency,
-            "show_analytic_tags": self.show_analytic_tags,
             "company_id": self.company_id.id,
             "account_ids": self.account_ids.ids,
             "partner_ids": self.partner_ids.ids,
-            "show_partner_details": self.show_partner_details,
+            "grouped_by": self.grouped_by,
             "cost_center_ids": self.cost_center_ids.ids,
             "show_cost_center": self.show_cost_center,
-            "analytic_tag_ids": self.analytic_tag_ids.ids,
             "journal_ids": self.account_journal_ids.ids,
             "centralize": self.centralize,
             "fy_start_date": self.fy_start_date,
@@ -310,6 +311,11 @@ class GeneralLedgerReportWizard(models.TransientModel):
             "domain": self._get_account_move_lines_domain(),
         }
 
+    def _prepare_report_data(self):
+        res = super()._prepare_report_data()
+        res.update(self._prepare_report_general_ledger())
+        return res
+
     def _export(self, report_type):
         """Default export is PDF."""
         return self._print_report(report_type)

odoo/addons/account_financial_report/wizard/general_ledger_wizard_view.xml

@@ -13,23 +13,20 @@
                         groups="base.group_multi_company"
                     />
                 </group>
-                <div
-                    attrs="{'invisible': [('not_only_one_unaffected_earnings_account', '=', True)]}"
-                >
+                <div invisible="not only_one_unaffected_earnings_account">
                     <group name="filters">
                         <group name="date_range">
                             <field name="date_range_id" />
                             <field name="date_from" />
                             <field name="date_to" />
                             <field name="fy_start_date" invisible="1" />
+                            <field name="target_move" widget="radio" />
                         </group>
                         <group name="other_filters">
-                            <field name="target_move" widget="radio" />
+                            <field name="grouped_by" />
                             <field name="centralize" />
-                            <field name="show_partner_details" />
                             <field name="hide_account_at_0" />
                             <field name="foreign_currency" />
-                            <field name="show_analytic_tags" />
                             <field name="show_cost_center" />
                         </group>
                     </group>
@@ -83,14 +80,6 @@
                                 options="{'no_create': True}"
                             />
                         </page>
-                        <page string="Filter analytic tags">
-                            <field
-                                name="analytic_tag_ids"
-                                widget="many2many_tags"
-                                nolabel="1"
-                                options="{'no_create': True}"
-                            />
-                        </page>
                         <page string="Additional Filtering">
                             <style>
                                 .o_domain_show_selection_button {display: none}
@@ -102,15 +91,15 @@
                                 context="{'skip_search_count': 1}"
                             />
                         </page>
+                        <page name="format" string="Format">
+                            <group>
+                                <field name="label_text_limit" />
+                            </group>
+                        </page>
                     </notebook>
                 </div>
-                <div
-                    attrs="{'invisible': [('not_only_one_unaffected_earnings_account', '=', False)]}"
-                >
-                    <field
-                        name="not_only_one_unaffected_earnings_account"
-                        invisible="1"
-                    />
+                <div invisible="only_one_unaffected_earnings_account">
+                    <field name="only_one_unaffected_earnings_account" invisible="1" />
                     <group />
                     <h4>
                         General Ledger can be computed only if selected company have
@@ -119,34 +108,30 @@
                     <group />
                 </div>
                 <footer>
-                    <div
-                        attrs="{'invisible': [('not_only_one_unaffected_earnings_account', '=', True)]}"
-                    >
+                    <div invisible="not only_one_unaffected_earnings_account">
                         <button
-                            name="button_export_html"
-                            string="View"
-                            type="object"
-                            default_focus="1"
-                            class="oe_highlight"
-                        />
+                        name="button_export_html"
+                        string="View"
+                        type="object"
+                        default_focus="1"
+                        class="oe_highlight"
+                    />
                         or
                         <button
-                            name="button_export_pdf"
-                            string="Export PDF"
-                            type="object"
-                        />
+                        name="button_export_pdf"
+                        string="Export PDF"
+                        type="object"
+                    />
                         or
                         <button
-                            name="button_export_xlsx"
-                            string="Export XLSX"
-                            type="object"
-                        />
+                        name="button_export_xlsx"
+                        string="Export XLSX"
+                        type="object"
+                    />
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </div>
-                    <div
-                        attrs="{'invisible': [('not_only_one_unaffected_earnings_account', '=', False)]}"
-                    >
+                    <div invisible="only_one_unaffected_earnings_account">
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </div>
                 </footer>

odoo/addons/account_financial_report/wizard/journal_ledger_wizard.py

@@ -1,7 +1,7 @@
 # Copyright 2017 ACSONE SA/NV
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 
 
 class JournalLedgerReportWizard(models.TransientModel):
@@ -38,15 +38,19 @@ class JournalLedgerReportWizard(models.TransientModel):
 
     @api.model
     def _get_move_targets(self):
-        return [("all", _("All")), ("posted", _("Posted")), ("draft", _("Not Posted"))]
+        return [
+            ("all", self.env._("All")),
+            ("posted", self.env._("Posted")),
+            ("draft", self.env._("Not Posted")),
+        ]
 
     @api.model
     def _get_sort_options(self):
-        return [("move_name", _("Entry number")), ("date", _("Date"))]
+        return [("move_name", self.env._("Entry number")), ("date", self.env._("Date"))]
 
     @api.model
     def _get_group_options(self):
-        return [("journal", _("Journal")), ("none", _("No group"))]
+        return [("journal", self.env._("Journal")), ("none", self.env._("No group"))]
 
     @api.onchange("date_range_id")
     def onchange_date_range_id(self):
@@ -75,7 +79,7 @@ class JournalLedgerReportWizard(models.TransientModel):
 
     def _print_report(self, report_type):
         self.ensure_one()
-        data = self._prepare_report_journal_ledger()
+        data = self._prepare_report_data()
         if report_type == "xlsx":
             report_name = "a_f_r.report_journal_ledger_xlsx"
         else:
@@ -90,12 +94,15 @@ class JournalLedgerReportWizard(models.TransientModel):
         )
 
     def _prepare_report_journal_ledger(self):
+        # TODO: Kept for compatibility - To be merged into _prepare_report_data in 19
         self.ensure_one()
         journals = self.journal_ids
         if not journals:
             # Not selecting a journal means that we'll display all journals
-            journals = self.env["account.journal"].search(
-                [("company_id", "=", self.company_id.id)]
+            journals = (
+                self.env["account.journal"]
+                .with_context(active_test=False)
+                .search([("company_id", "=", self.company_id.id)])
             )
         return {
             "wizard_id": self.id,
@@ -112,6 +119,11 @@ class JournalLedgerReportWizard(models.TransientModel):
             "with_auto_sequence": self.with_auto_sequence,
         }
 
+    def _prepare_report_data(self):
+        res = super()._prepare_report_data()
+        res.update(self._prepare_report_journal_ledger())
+        return res
+
     def _export(self, report_type):
         """Default export is PDF."""
         self.ensure_one()

odoo/addons/account_financial_report/wizard/journal_ledger_wizard_view.xml

@@ -32,6 +32,7 @@
                         <field name="foreign_currency" />
                         <field name="with_account_name" />
                         <field name="with_auto_sequence" />
+                        <field name="label_text_limit" />
                     </group>
                     <group />
                 </group>
@@ -41,24 +42,24 @@
                 </group>
                 <footer>
                     <button
-                        name="button_export_html"
-                        string="View"
-                        type="object"
-                        default_focus="1"
-                        class="oe_highlight"
-                    />
+                    name="button_export_html"
+                    string="View"
+                    type="object"
+                    default_focus="1"
+                    class="oe_highlight"
+                />
                     or
                     <button
-                        name="button_export_pdf"
-                        string="Export PDF"
-                        type="object"
-                    />
+                    name="button_export_pdf"
+                    string="Export PDF"
+                    type="object"
+                />
                     or
                     <button
-                        name="button_export_xlsx"
-                        string="Export XLSX"
-                        type="object"
-                    />
+                    name="button_export_xlsx"
+                    string="Export XLSX"
+                    type="object"
+                />
                     or
                     <button string="Cancel" class="oe_link" special="cancel" />
                 </footer>