Merge PR #4766 into 14.0

Signed-off-by francesco-ooops

Author: OCA-git-bot

assets_management/README.rst

@@ -88,7 +88,8 @@ Contributors
 
   * Simone Rubino <simone.rubino@aion-tech.it>
 
-Base icon made by `surang <https://www.flaticon.com/authors/surang>`_ from `www.flaticon.com <https://www.flaticon.com/>`_.
+Base icon made by `surang <https://www.flaticon.com/authors/surang>`__
+from `www.flaticon.com <http://www.flaticon.com>`__.
 
 Maintainers
 ~~~~~~~~~~~

assets_management/data/asset_data.xml

@@ -37,8 +37,8 @@
     </record>
     <record id="ad_mode_materiale_line" model="asset.depreciation.mode.line">
         <field name="mode_id" ref="ad_mode_materiale" />
-        <field name="from_nr">1</field>
-        <field name="to_nr">1</field>
+        <field name="from_year_nr">1</field>
+        <field name="to_year_nr">1</field>
         <field name="coefficient">0.5</field>
     </record>
 

assets_management/models/account_fiscal_year.py

@@ -35,3 +35,25 @@ def get_fiscal_year_by_date_domain(self, date, company=None):
         if company:
             domain.append(("company_id", "in", company.ids))
         return domain
+
+    @api.model
+    def _get_passed_years(self, start_date, end_date):
+        """Find all fiscal years between `start_date` and `end_date`."""
+        if start_date and end_date:
+            overlapping_fiscal_year_domain = self.new(
+                {
+                    "date_from": start_date,
+                    "date_to": end_date,
+                }
+            )._get_overlapping_domain()
+            # Exclude current record's NewId
+            # because it is not supported in domains
+            overlapping_fiscal_year_domain = [
+                term if term[0] != "id" else ("id", "!=", 0)
+                for term in overlapping_fiscal_year_domain
+            ]
+            overlapping_fiscal_years = self.search(overlapping_fiscal_year_domain)
+            passed_years = len(overlapping_fiscal_years)
+        else:
+            passed_years = None
+        return passed_years

assets_management/models/asset_depreciation.py

@@ -293,26 +293,36 @@ def check_before_generate_depreciation_lines(self, dep_date):
                 ).format(draft_names)
             )
 
-    def generate_depreciation_lines(self, dep_date):
+    def generate_depreciation_lines(self, dep_date, period=None, period_count=None):
         # Set new date within context if necessary
         self.check_before_generate_depreciation_lines(dep_date)
 
         new_lines = self.env["asset.depreciation.line"]
         for dep in self:
-            new_line = dep.generate_depreciation_lines_single(dep_date)
+            new_line = dep.generate_depreciation_lines_single(
+                dep_date, period=period, period_count=period_count
+            )
             if new_line:
                 new_lines |= new_line
 
         return new_lines
 
-    def generate_depreciation_lines_single(self, dep_date):
+    def generate_depreciation_lines_single(
+        self, dep_date, period=None, period_count=None
+    ):
         self.ensure_one()
         res = self.env["asset.depreciation.line"]
         if self.last_depreciation_date and self.last_depreciation_date > dep_date:
             return res
-        dep_nr = self.get_max_depreciation_nr() + 1
-        dep = self.with_context(dep_nr=dep_nr, used_asset=self.asset_id.used)
-        dep_amount = dep.get_depreciation_amount(dep_date)
+        passed_fiscal_years = self.env["account.fiscal.year"]._get_passed_years(
+            self.asset_id.purchase_date, dep_date
+        )
+        dep = self.with_context(
+            passed_fiscal_years=passed_fiscal_years, used_asset=self.asset_id.used
+        )
+        dep_amount = dep.get_depreciation_amount(
+            dep_date, period=period, period_count=period_count
+        )
         if not dep_amount:
             return res
         dep = dep.with_context(dep_amount=dep_amount)
@@ -397,15 +407,17 @@ def get_depreciable_amount(self, dep_date=None):
             depreciable_amount = 0
         return depreciable_amount
 
-    def get_depreciation_amount(self, dep_date):
+    def get_depreciation_amount(self, dep_date, period=None, period_count=None):
         self.ensure_one()
         zero_dep_date = self.zero_depreciation_until
         if zero_dep_date and dep_date <= zero_dep_date:
             return 0
 
         # Get depreciable amount, multiplier and digits
         amount = self.get_depreciable_amount(dep_date)
-        multiplier = self.get_depreciation_amount_multiplier(dep_date)
+        multiplier = self.get_depreciation_amount_multiplier(
+            dep_date, period=period, period_count=period_count
+        )
         digits = self.env["decimal.precision"].precision_get("Account")
         dep_amount = round(amount * multiplier, digits)
 
@@ -415,12 +427,20 @@ def get_depreciation_amount(self, dep_date):
 
         return dep_amount
 
-    def get_depreciation_amount_multiplier(self, dep_date):
+    def get_depreciation_amount_multiplier(
+        self, dep_date, period=None, period_count=None
+    ):
         self.ensure_one()
 
         # Base multiplier
         multiplier = self.percentage / 100
 
+        if period == "month":
+            multiplier /= 12
+
+        if period_count:
+            multiplier *= period_count
+
         # Update multiplier from depreciation mode data
         multiplier *= self.mode_id.get_depreciation_amount_multiplier()
 
@@ -504,14 +524,6 @@ def get_dismiss_account_move_vals(self):
             "move_type": "entry",
         }
 
-    def get_max_depreciation_nr(self):
-        self.ensure_one()
-        num_lines = self.line_ids.filtered("requires_depreciation_nr")
-        nums = num_lines.mapped("depreciation_nr")
-        if not nums:
-            nums = [0]
-        return max(nums)
-
     def get_pro_rata_temporis_dates(self, date):
         """
         Gets useful dates for pro rata temporis computations, according to

assets_management/models/asset_depreciation_line.py

@@ -369,10 +369,14 @@ def generate_account_move_single(self):
 
     def get_account_move_vals(self):
         self.ensure_one()
+        journal = self.env.context.get(
+            "l10n_it_asset_override_journal",
+            self.asset_id.category_id.journal_id,
+        )
         return {
             "company_id": self.company_id.id,
             "date": self.date,
-            "journal_id": self.asset_id.category_id.journal_id.id,
+            "journal_id": journal.id,
             "line_ids": [],
             "ref": _("Asset: ") + self.asset_id.make_name(),
             "move_type": "entry",

assets_management/models/asset_depreciation_mode_line.py

@@ -8,7 +8,7 @@
 class AssetDepreciationModeLine(models.Model):
     _name = "asset.depreciation.mode.line"
     _description = "Asset Depreciation Mode Line"
-    _order = "from_nr asc, to_nr asc"
+    _order = "from_year_nr asc, to_year_nr asc"
 
     application = fields.Selection(
         [("coefficient", "Coefficient"), ("percentage", "Percentage")],
@@ -25,9 +25,12 @@ class AssetDepreciationModeLine(models.Model):
         "res.company", readonly=True, related="mode_id.company_id", string="Company"
     )
 
-    from_nr = fields.Integer(
+    from_year_nr = fields.Integer(
         required=True,
-        string="From Nr",
+        string="From Year",
+        help="Minimum number of fiscal years passed "
+        "from asset purchase date "
+        "to apply this line.",
     )
 
     mode_id = fields.Many2one(
@@ -40,8 +43,11 @@ class AssetDepreciationModeLine(models.Model):
 
     percentage = fields.Float(string="Percentage")
 
-    to_nr = fields.Integer(
-        string="To Nr",
+    to_year_nr = fields.Integer(
+        string="To Year",
+        help="Maximum number of fiscal years passed "
+        "from asset purchase date "
+        "to apply this line.",
     )
 
     @api.onchange("application")
@@ -57,13 +63,14 @@ def onchange_application(self):
 
     def get_depreciation_amount_multiplier(self):
         multiplier = 1
-        nr = self._context.get("dep_nr")
-        if nr is None:
+        passed_fiscal_years = self._context.get("passed_fiscal_years")
+        if passed_fiscal_years is None:
             # Cannot compare to any line
             return multiplier
 
         lines = self.filtered(
-            lambda l: l.from_nr <= nr and (not l.to_nr or l.to_nr >= nr)
+            lambda line: line.from_year_nr <= passed_fiscal_years
+            and (not line.to_year_nr or line.to_year_nr >= passed_fiscal_years)
         )
         if not lines:
             return multiplier

assets_management/static/description/index.html

@@ -8,11 +8,10 @@
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
-Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -275,7 +274,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: gray; } /* line numbers */
+pre.code .ln { color: grey; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -301,7 +300,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic, pre.problematic {
+span.problematic {
   color: red }
 
 span.section-subtitle {
@@ -428,14 +427,13 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 </ul>
 </li>
 </ul>
-<p>Base icon made by <a class="reference external" href="https://www.flaticon.com/authors/surang">surang</a> from <a class="reference external" href="https://www.flaticon.com/">www.flaticon.com</a>.</p>
+<p>Base icon made by <a class="reference external" href="https://www.flaticon.com/authors/surang">surang</a>
+from <a class="reference external" href="http://www.flaticon.com">www.flaticon.com</a>.</p>
 </div>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org">
-<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
-</a>
+<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>