[IMP] Aggiunta PR OCA#3330 per cespiti già venduti

l10n_it_asset_management/report/asset_journal.py

@@ -55,7 +55,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",
     )
@@ -112,6 +112,8 @@ def do_print(self, report_type):
             xml_id = "l10n_it_asset_management.report_asset_journal_pdf"
         elif report_type == "qweb-html":
             xml_id = "l10n_it_asset_management.report_asset_journal_html"
+        else:
+            xml_id = "l10n_it_asset_management.report_asset_journal_xlsx"
         report = self.env.ref(xml_id)
         return report.report_action(self)
 
@@ -271,6 +273,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):

l10n_it_asset_management/report/asset_previsional.py

@@ -56,7 +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",
     )
@@ -117,6 +117,8 @@ def do_print(self, report_type):
             xml_id = "l10n_it_asset_management.report_asset_previsional_pdf"
         elif report_type == "qweb-html":
             xml_id = "l10n_it_asset_management.report_asset_previsional_html"
+        else:
+            xml_id = "l10n_it_asset_management.report_asset_previsional_xlsx"
         report = self.env.ref(xml_id)
         return report.report_action(self)
 
@@ -300,6 +302,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):

l10n_it_asset_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>
 

l10n_it_asset_management/report/templates/asset_previsional.xml

@@ -32,6 +32,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>
 

l10n_it_asset_management/wizard/asset_journal_report.py

@@ -71,7 +71,7 @@ def get_default_type_ids(self):
     show_totals = fields.Boolean(default=True)
 
     show_category_totals = fields.Boolean(default=True)
-
+    show_sold_assets = fields.Boolean()
     report_footer_year = fields.Char(default=get_default_report_footer_year)
 
     type_ids = fields.Many2many(
@@ -150,6 +150,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)],
         }

l10n_it_asset_management/wizard/asset_journal_report_view.xml

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

l10n_it_asset_management/wizard/asset_previsional_report.py

@@ -71,7 +71,7 @@ def get_default_type_ids(self):
     show_totals = fields.Boolean(default=True)
 
     show_category_totals = fields.Boolean(default=True)
-
+    show_sold_assets = fields.Boolean()
     report_footer_year = fields.Char(default=get_default_report_footer_year)
 
     type_ids = fields.Many2many(
@@ -150,6 +150,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)],
         }

l10n_it_asset_management/wizard/asset_previsional_report_view.xml

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