[FIX][14.0] assets_management do not report assets sold before report…

… date

assets_management/report/asset_journal.py

@@ -56,6 +56,7 @@ class Report(models.TransientModel):
     show_totals = fields.Boolean()
 
     show_category_totals = fields.Boolean()
+    show_sold_assets = fields.Boolean()
 
     type_ids = fields.Many2many(
         "asset.depreciation.type",
@@ -288,6 +289,12 @@ def get_depreciations(self):
             domain += [("date_start", "<=", self.date)]
         if self.type_ids:
             domain += [("type_id", "in", self.type_ids.ids)]
+        if not self.show_sold_assets:
+            domain += [
+                "|",
+                ("asset_id.sale_date", "=", False),
+                ("asset_id.sale_date", ">=", self.date.replace(month=1, day=1)),
+            ]
         return self.env["asset.depreciation"].search(domain)
 
     def set_report_name(self):

assets_management/report/asset_previsional.py

@@ -57,6 +57,7 @@ class Report(models.TransientModel):
     show_totals = fields.Boolean()
 
     show_category_totals = fields.Boolean()
+    show_sold_assets = fields.Boolean()
 
     type_ids = fields.Many2many(
         "asset.depreciation.type",
@@ -317,6 +318,12 @@ def get_assets(self):
             domain += [("company_id", "=", self.company_id.id)]
         if self.date:
             domain += [("purchase_date", "<=", self.date)]
+        if not self.show_sold_assets:
+            domain += [
+                "|",
+                ("sale_date", "=", False),
+                ("sale_date", ">=", self.date.replace(month=1, day=1)),
+            ]
         return self.env["asset.asset"].search(domain)
 
     def set_report_name(self):

assets_management/report/templates/asset_journal.xml

@@ -30,6 +30,11 @@
             <h1 style="text-align:center;">
                 <span t-field="o.report_name" />
             </h1>
+            <t t-if="o.show_sold_assets">
+                <div style="width: 100%; text-align:center;">
+                    Sold assets: show
+                </div>
+            </t>
         </div>
     </template>
 

assets_management/report/templates/asset_previsional.xml

@@ -30,6 +30,11 @@
             <h1 style="text-align:center;">
                 <span t-field="o.report_name" />
             </h1>
+            <t t-if="o.show_sold_assets">
+                <div style="width: 100%; text-align:center;">
+                    Sold assets: show
+                </div>
+            </t>
         </div>
     </template>
 

assets_management/wizard/asset_journal_report.py

@@ -71,6 +71,11 @@ def get_default_type_ids(self):
     show_totals = fields.Boolean(default=True, string="Show Totals")
 
     show_category_totals = fields.Boolean(default=True, string="Show Category Totals")
+    show_sold_assets = fields.Boolean(
+        help="By default, only unsold or assets sold in the selected year are printed."
+        "\nBy selecting this flag, the report will show all assets, ignoring the sold "
+        "check."
+    )
 
     report_footer_year = fields.Char(
         default=get_default_report_footer_year, string="Report Footer Year"
@@ -152,6 +157,7 @@ def prepare_report_vals(self):
             "date": self.date,
             "show_totals": self.show_totals,
             "show_category_totals": self.show_category_totals,
+            "show_sold_assets": self.show_sold_assets,
             "report_footer_year": self.report_footer_year,
             "type_ids": [(6, 0, self.type_ids.ids)],
         }

assets_management/wizard/asset_journal_report_view.xml

@@ -35,6 +35,7 @@
                         <group>
                             <field name="show_totals" />
                             <field name="show_category_totals" />
+                            <field name="show_sold_assets" />
                         </group>
                     </group>
                     <group name="report_options" string="Options">

assets_management/wizard/asset_previsional_report.py

@@ -71,6 +71,11 @@ def get_default_type_ids(self):
     show_totals = fields.Boolean(default=True, string="Show Totals")
 
     show_category_totals = fields.Boolean(default=True, string="Show Category Totals")
+    show_sold_assets = fields.Boolean(
+        help="By default, only unsold or assets sold in the selected year are printed."
+        "\nBy selecting this flag, the report will show all assets, ignoring the sold "
+        "check."
+    )
 
     report_footer_year = fields.Char(
         default=get_default_report_footer_year, string="Report Footer Year"
@@ -152,6 +157,7 @@ def prepare_report_vals(self):
             "date": self.date,
             "show_totals": self.show_totals,
             "show_category_totals": self.show_category_totals,
+            "show_sold_assets": self.show_sold_assets,
             "report_footer_year": self.report_footer_year,
             "type_ids": [(6, 0, self.type_ids.ids)],
         }

assets_management/wizard/asset_previsional_report_view.xml

@@ -35,6 +35,7 @@
                         <group>
                             <field name="show_totals" />
                             <field name="show_category_totals" />
+                            <field name="show_sold_assets" />
                         </group>
                     </group>
                     <group name="report_options" string="Options">