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

… date
OCA · May 29, 2023 · 5d1b7e9 · 5d1b7e9
1 parent a067baa
commit 5d1b7e9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/assets_management/report/asset_journal.py b/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",
@@ -172,7 +173,8 @@ def generate_structure(self):
         assets = deps.mapped("asset_id")
         if self.date:
             assets = assets.filtered(
-                lambda a: not a.purchase_date or a.purchase_date <= self.date
+                lambda a: (not a.purchase_date or a.purchase_date <= self.date)
+                and (a.sale_date and a.sale_date >= self.date or not a.sale_date)
             )
             dep_lines = dep_lines.filtered(lambda dl: dl.date <= self.date)
         categories = assets.mapped("category_id")
@@ -288,6 +290,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),
+            ]
         return self.env["asset.depreciation"].search(domain)
 
     def set_report_name(self):

diff --git a/assets_management/wizard/asset_journal_report.py b/assets_management/wizard/asset_journal_report.py
@@ -71,6 +71,7 @@ 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()
 
     report_footer_year = fields.Char(
         default=get_default_report_footer_year, string="Report Footer Year"

diff --git a/assets_management/wizard/asset_journal_report_view.xml b/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">