Merge PR #761 into 16.0

Signed-off-by pedrobaeza

account_reconcile_analytic_tag/__manifest__.py

@@ -12,5 +12,6 @@
     "maintainers": ["victoralmau"],
     "data": [
         "views/account_bank_statement_line_views.xml",
+        "views/account_reconcile_model_views.xml",
     ],
 }

account_reconcile_analytic_tag/models/__init__.py

@@ -1,3 +1,4 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from . import account_reconcile_abstract
 from . import account_bank_statement_line
+from . import account_reconcile_model

account_reconcile_analytic_tag/models/account_reconcile_model.py

@@ -0,0 +1,47 @@
+# Copyright 2024 Tecnativa - Víctor Martínez
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
+from odoo import fields, models
+
+
+class AccountReconcileModel(models.Model):
+    _inherit = "account.reconcile.model"
+
+    # TODO: Remove if merging https://github.com/odoo/odoo/pull/188808
+    def _get_write_off_move_lines_dict(self, residual_balance, partner_id):
+        res = super()._get_write_off_move_lines_dict(
+            residual_balance=residual_balance, partner_id=partner_id
+        )
+        if len(res) == 0:
+            return res
+        currency = self.company_id.currency_id
+        for index, line in enumerate(self.line_ids):
+            if line.amount_type == "percentage":
+                balance = currency.round(residual_balance * (line.amount / 100.0))
+            elif line.amount_type == "fixed":
+                balance = currency.round(
+                    line.amount * (1 if residual_balance > 0.0 else -1)
+                )
+            else:
+                balance = 0.0
+
+            if currency.is_zero(balance):
+                continue
+
+            res[index]["manual_analytic_tag_ids"] = [(6, 0, line.analytic_tag_ids.ids)]
+        return res
+
+
+class AccountReconcileModelLine(models.Model):
+    _inherit = "account.reconcile.model.line"
+
+    analytic_tag_ids = fields.Many2many(
+        comodel_name="account.analytic.tag",
+        string="Analytic Tags",
+        domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]",
+    )
+
+    # TODO: Use if merging https://github.com/odoo/odoo/pull/188808
+    # def _get_write_off_move_line_dict(self, balance):
+    #     vals = super()._get_write_off_move_line_dict(balance)
+    #     vals["manual_analytic_tag_ids"] = [(6, 0, self.analytic_tag_ids.ids)]
+    #     return vals

account_reconcile_analytic_tag/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 @@ pre.literal-block, pre.doctest-block, pre.math, pre.code {
   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.option {
 span.pre {
   white-space: pre }
 
-span.problematic, pre.problematic {
+span.problematic {
   color: red }
 
 span.section-subtitle {
@@ -410,9 +409,7 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org">
+<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
-<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>

account_reconcile_analytic_tag/views/account_bank_statement_line_views.xml

@@ -17,6 +17,7 @@
                     groups="account_analytic_tag.group_analytic_tags"
                     widget="many2many_tags"
                     attrs="{'invisible': ['|', ('manual_kind', '=', 'liquidity'), ('manual_reference', '=', False)], 'readonly': [('is_reconciled', '=', True)]}"
+                    options="{'color_field': 'color'}"
                 />
             </xpath>
         </field>

account_reconcile_analytic_tag/views/account_reconcile_model_views.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_account_reconcile_model_form" model="ir.ui.view">
+        <field name="name">account.reconcile.model.form</field>
+        <field name="model">account.reconcile.model</field>
+        <field name="inherit_id" ref="account.view_account_reconcile_model_form" />
+        <field name="arch" type="xml">
+            <xpath
+                expr="//field[@name='line_ids']/tree//field[@name='label']"
+                position="after"
+            >
+                <field
+                    name="analytic_tag_ids"
+                    groups="account_analytic_tag.group_analytic_tags"
+                    widget="many2many_tags"
+                    optional="hide"
+                    options="{'color_field': 'color'}"
+                />
+            </xpath>
+        </field>
+    </record>
+</odoo>