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/wizard/open_items_wizard.py

@@ -59,6 +59,10 @@ class OpenItemsReportWizard(models.TransientModel):
         comodel_name="account.account",
         help="Ending account in a range",
     )
+    grouped_by = fields.Selection(
+        selection=[("partners", "Partners"), ("salesperson", "Partner Salesperson")],
+        default="partners",
+    )
 
     @api.onchange("account_code_from", "account_code_to")
     def on_change_account_range(self):
@@ -79,7 +83,7 @@ class OpenItemsReportWizard(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": {
@@ -103,13 +107,13 @@ class OpenItemsReportWizard(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.ids)]
             res["domain"]["partner_ids"] += self._get_partner_ids_domain()
         return res
 
@@ -120,21 +124,36 @@ class OpenItemsReportWizard(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 _calculate_amounts_by_partner(self, account_id, open_items_move_lines_data):
+        total_amount = {}
+        for line in open_items_move_lines_data:
+            partner_id_key = line["partner_id"]
+            if account_id not in total_amount:
+                total_amount[account_id] = {}
+            if partner_id_key not in total_amount[account_id]:
+                total_amount[account_id][partner_id_key] = {"residual": 0.0}
+            total_amount[account_id][partner_id_key]["residual"] += line[
+                "amount_residual"
+            ]
+        return total_amount
+
     def _print_report(self, report_type):
         self.ensure_one()
-        data = self._prepare_report_open_items()
+        data = self._prepare_report_data()
         if report_type == "xlsx":
             report_name = "a_f_r.report_open_items_xlsx"
         else:
@@ -149,6 +168,7 @@ class OpenItemsReportWizard(models.TransientModel):
         )
 
     def _prepare_report_open_items(self):
+        # TODO: Kept for compatibility - To be merged into _prepare_report_data in 19
         self.ensure_one()
         return {
             "wizard_id": self.id,
@@ -163,7 +183,13 @@ class OpenItemsReportWizard(models.TransientModel):
             "account_ids": self.account_ids.ids,
             "partner_ids": self.partner_ids.ids or [],
             "account_financial_report_lang": self.env.lang,
+            "grouped_by": self.grouped_by,
         }
 
+    def _prepare_report_data(self):
+        res = super()._prepare_report_data()
+        res.update(self._prepare_report_open_items())
+        return res
+
     def _export(self, report_type):
         return self._print_report(report_type)

odoo/addons/account_financial_report/wizard/open_items_wizard_view.xml

@@ -21,8 +21,10 @@
                     <group name="other_filters">
                         <field name="target_move" widget="radio" />
                         <field name="show_partner_details" />
+                        <field name="grouped_by" />
                         <field name="hide_account_at_0" />
                         <field name="foreign_currency" />
+                        <field name="label_text_limit" />
                     </group>
                 </group>
                 <group name="partner_filter" col="1">
@@ -63,24 +65,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>

odoo/addons/account_financial_report/wizard/trial_balance_wizard.py

@@ -4,7 +4,7 @@
 # Copyright 2018 ForgeFlow, S.L.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import UserError, ValidationError
 from odoo.tools import date_utils
 
@@ -26,19 +26,9 @@ class TrialBalanceReportWizard(models.TransientModel):
         required=True,
         default="posted",
     )
-    hierarchy_on = fields.Selection(
-        [
-            ("computed", "Computed Accounts"),
-            ("relation", "Child Accounts"),
-            ("none", "No hierarchy"),
-        ],
-        required=True,
-        default="none",
-        help="""Computed Accounts: Use when the account group have codes
-        that represent prefixes of the actual accounts.\n
-        Child Accounts: Use when your account groups are hierarchical.\n
-        No hierarchy: Use to display just the accounts, without any grouping.
-        """,
+    show_hierarchy = fields.Boolean(
+        string="Show hierarchy",
+        help="Use when your account groups are hierarchical",
     )
     limit_hierarchy_level = fields.Boolean("Limit hierarchy levels")
     show_hierarchy_level = fields.Integer("Hierarchy Levels to display", default=1)
@@ -60,9 +50,10 @@ class TrialBalanceReportWizard(models.TransientModel):
     show_partner_details = fields.Boolean()
     partner_ids = fields.Many2many(comodel_name="res.partner", string="Filter partners")
     journal_ids = fields.Many2many(comodel_name="account.journal")
-
-    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,6 +68,15 @@ class TrialBalanceReportWizard(models.TransientModel):
         comodel_name="account.account",
         help="Ending account in a range",
     )
+    grouped_by = fields.Selection(
+        selection=[("analytic_account", "Analytic Account")], default=False
+    )
+
+    @api.onchange("grouped_by")
+    def onchange_grouped_by(self):
+        if self.grouped_by == "analytic_account":
+            self.show_partner_details = False
+            self.show_hierarchy = False
 
     @api.onchange("account_code_from", "account_code_to")
     def on_change_account_range(self):
@@ -86,22 +86,32 @@ class TrialBalanceReportWizard(models.TransientModel):
             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)
+            start_range = self.account_code_from.code
+            end_range = self.account_code_to.code
             self.account_ids = self.env["account.account"].search(
                 [("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
-                )
+            if isinstance(self.account_ids[0].id, models.NewId):
+                real_ids = self.account_ids.ids
+                account_ids = self.env["account.account"].browse(real_ids)
+                if self.company_id:
+                    self.account_ids = account_ids.filtered(
+                        lambda a: self.company_id in a.company_ids
+                    )
+            else:
+                if self.company_id:
+                    self.account_ids = self.account_ids.filtered(
+                        lambda a: self.company_id in a.company_ids
+                    )
 
-    @api.constrains("hierarchy_on", "show_hierarchy_level")
+    @api.constrains("show_hierarchy", "show_hierarchy_level")
     def _check_show_hierarchy_level(self):
         for rec in self:
-            if rec.hierarchy_on != "none" and rec.show_hierarchy_level <= 0:
+            if rec.show_hierarchy and rec.show_hierarchy_level <= 0:
                 raise UserError(
-                    _("The hierarchy level to filter on must be " "greater than 0.")
+                    self.env._(
+                        "The hierarchy level to filter on must be greater than 0."
+                    )
                 )
 
     @api.depends("date_from")
@@ -117,17 +127,21 @@ class TrialBalanceReportWizard(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
@@ -147,7 +161,7 @@ class TrialBalanceReportWizard(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": {
@@ -160,7 +174,7 @@ class TrialBalanceReportWizard(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"]["partner_ids"] += self._get_partner_ids_domain()
             res["domain"]["date_range_id"] += [
                 "|",
@@ -185,7 +199,7 @@ class TrialBalanceReportWizard(models.TransientModel):
                 and rec.company_id != rec.date_range_id.company_id
             ):
                 raise ValidationError(
-                    _(
+                    self.env._(
                         "The Company in the Trial Balance Report Wizard and in "
                         "Date Range must be the same."
                     )
@@ -195,13 +209,15 @@ class TrialBalanceReportWizard(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
@@ -211,17 +227,17 @@ class TrialBalanceReportWizard(models.TransientModel):
         """Handle partners change."""
         if self.show_partner_details:
             self.receivable_accounts_only = self.payable_accounts_only = True
+            self.grouped_by = False
         else:
             self.receivable_accounts_only = self.payable_accounts_only = False
 
     @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]),
                 ]
             )
 
@@ -233,7 +249,7 @@ class TrialBalanceReportWizard(models.TransientModel):
 
     def _print_report(self, report_type):
         self.ensure_one()
-        data = self._prepare_report_trial_balance()
+        data = self._prepare_report_data()
         if report_type == "xlsx":
             report_name = "a_f_r.report_trial_balance_xlsx"
         else:
@@ -248,6 +264,7 @@ class TrialBalanceReportWizard(models.TransientModel):
         )
 
     def _prepare_report_trial_balance(self):
+        # TODO: Kept for compatibility - To be merged into _prepare_report_data in 19
         self.ensure_one()
         return {
             "wizard_id": self.id,
@@ -261,15 +278,21 @@ class TrialBalanceReportWizard(models.TransientModel):
             "partner_ids": self.partner_ids.ids or [],
             "journal_ids": self.journal_ids.ids or [],
             "fy_start_date": self.fy_start_date,
-            "hierarchy_on": self.hierarchy_on,
+            "show_hierarchy": self.show_hierarchy,
             "limit_hierarchy_level": self.limit_hierarchy_level,
             "show_hierarchy_level": self.show_hierarchy_level,
             "hide_parent_hierarchy_level": self.hide_parent_hierarchy_level,
             "show_partner_details": self.show_partner_details,
             "unaffected_earnings_account": self.unaffected_earnings_account.id,
             "account_financial_report_lang": self.env.lang,
+            "grouped_by": self.grouped_by,
         }
 
+    def _prepare_report_data(self):
+        res = super()._prepare_report_data()
+        res.update(self._prepare_report_trial_balance())
+        return res
+
     def _export(self, report_type):
         """Default export is PDF."""
         return self._print_report(report_type)

odoo/addons/account_financial_report/wizard/trial_balance_wizard_view.xml

@@ -6,6 +6,14 @@
         <field name="model">trial.balance.report.wizard</field>
         <field name="arch" type="xml">
             <form>
+                <div
+                    class="alert alert-warning"
+                    role="alert"
+                    invisible="grouped_by!='analytic_account'"
+                >
+                    <i class="fa fa-exclamation-triangle mr-3" />
+                    Duplicate amounts may be shown because more than one analytical account may be defined in the journal items.
+                </div>
                 <group name="main_info">
                     <field
                         name="company_id"
@@ -13,9 +21,7 @@
                         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" />
@@ -25,31 +31,35 @@
                         </group>
                         <group name="other_filters">
                             <field name="target_move" widget="radio" />
+                            <field name="grouped_by" invisible="1" />
+                            <field
+                                name="grouped_by"
+                                groups="analytic.group_analytic_accounting"
+                            />
                             <field name="hide_account_at_0" />
-                            <field name="show_partner_details" />
+                            <field name="show_partner_details" invisible="grouped_by" />
                             <field
-                                name="hierarchy_on"
-                                widget="radio"
-                                attrs="{'invisible':[('show_partner_details','=',True)]}"
+                                name="show_hierarchy"
+                                invisible="show_partner_details == True or grouped_by"
                             />
                             <field
                                 name="limit_hierarchy_level"
-                                attrs="{'invisible':['|', ('hierarchy_on','in',['none', 'computed']),('show_partner_details','=',True)]}"
+                                invisible="show_hierarchy == False or show_partner_details == True"
                             />
                             <field
                                 name="show_hierarchy_level"
-                                attrs="{'invisible':[('limit_hierarchy_level','=', False)]}"
+                                invisible="limit_hierarchy_level == False"
                             />
                             <field
                                 name="hide_parent_hierarchy_level"
-                                attrs="{'invisible':[('limit_hierarchy_level','=', False)]}"
+                                invisible="limit_hierarchy_level == False"
                             />
                             <field name="foreign_currency" />
                         </group>
                     </group>
                     <group
                         name="partner_filter"
-                        attrs="{'invisible':[('show_partner_details','!=',True)]}"
+                        invisible="show_partner_details == True"
                         col="1"
                     >
                         <label for="partner_ids" />
@@ -67,7 +77,7 @@
                         nolabel="1"
                         options="{'no_create': True}"
                     />
-                    <group attrs="{'invisible':[('show_partner_details','!=',True)]}" />
+                    <group invisible="show_partner_details == True" />
                     <div />
                     <group name="account_filter" col="4">
                         <label for="account_ids" colspan="4" />
@@ -98,13 +108,8 @@
                         />
                     </group>
                 </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>
                         Trial Balance can be computed only if selected company have only
@@ -113,34 +118,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/vat_report_wizard.py

@@ -1,7 +1,7 @@
 # Copyright  2018 Forest and Biomass Romania
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import ValidationError
 
 
@@ -60,7 +60,7 @@ class VATReportWizard(models.TransientModel):
                 and rec.company_id != rec.date_range_id.company_id
             ):
                 raise ValidationError(
-                    _(
+                    self.env._(
                         "The Company in the Vat Report Wizard and in "
                         "Date Range must be the same."
                     )
@@ -68,7 +68,7 @@ class VATReportWizard(models.TransientModel):
 
     def _print_report(self, report_type):
         self.ensure_one()
-        data = self._prepare_vat_report()
+        data = self._prepare_report_data()
         if report_type == "xlsx":
             report_name = "a_f_r.report_vat_report_xlsx"
         else:
@@ -83,6 +83,7 @@ class VATReportWizard(models.TransientModel):
         )
 
     def _prepare_vat_report(self):
+        # TODO: Kept for compatibility - To be merged into _prepare_report_data in 19
         self.ensure_one()
         return {
             "wizard_id": self.id,
@@ -95,6 +96,11 @@ class VATReportWizard(models.TransientModel):
             "account_financial_report_lang": self.env.lang,
         }
 
+    def _prepare_report_data(self):
+        res = super()._prepare_report_data()
+        res.update(self._prepare_vat_report())
+        return res
+
     def _export(self, report_type):
         """Default export is PDF."""
         return self._print_report(report_type)

odoo/addons/account_financial_report/wizard/vat_report_wizard_view.xml

@@ -26,24 +26,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>