Víctor Martínez
parent
17a9847892
commit
c443b0de2a
|
|
@ -0,0 +1,86 @@
|
|||
=======================================
|
||||
Analytic tags in account reconciliation
|
||||
=======================================
|
||||
|
||||
..
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
!! This file is generated by oca-gen-addon-readme !!
|
||||
!! changes will be overwritten. !!
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
!! source digest: sha256:5e65f5558294201ee5178e15be3ac2f796fbc6560fa805c6a72486cd4b57df0d
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
|
||||
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
|
||||
:target: https://odoo-community.org/page/development-status
|
||||
:alt: Beta
|
||||
.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
|
||||
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
|
||||
:alt: License: AGPL-3
|
||||
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--reconcile-lightgray.png?logo=github
|
||||
:target: https://github.com/OCA/account-reconcile/tree/16.0/account_reconcile_analytic_tag
|
||||
:alt: OCA/account-reconcile
|
||||
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
|
||||
:target: https://translation.odoo-community.org/projects/account-reconcile-16-0/account-reconcile-16-0-account_reconcile_analytic_tag
|
||||
:alt: Translate me on Weblate
|
||||
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
|
||||
:target: https://runboat.odoo-community.org/builds?repo=OCA/account-reconcile&target_branch=16.0
|
||||
:alt: Try me on Runboat
|
||||
|
||||
|badge1| |badge2| |badge3| |badge4| |badge5|
|
||||
|
||||
This module adds the analytical tags to the bank reconciliation.
|
||||
|
||||
**Table of contents**
|
||||
|
||||
.. contents::
|
||||
:local:
|
||||
|
||||
Bug Tracker
|
||||
===========
|
||||
|
||||
Bugs are tracked on `GitHub Issues <https://github.com/OCA/account-reconcile/issues>`_.
|
||||
In case of trouble, please check there if your issue has already been reported.
|
||||
If you spotted it first, help us to smash it by providing a detailed and welcomed
|
||||
`feedback <https://github.com/OCA/account-reconcile/issues/new?body=module:%20account_reconcile_analytic_tag%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
|
||||
|
||||
Do not contact contributors directly about support or help with technical issues.
|
||||
|
||||
Credits
|
||||
=======
|
||||
|
||||
Authors
|
||||
~~~~~~~
|
||||
|
||||
* Tecnativa
|
||||
|
||||
Contributors
|
||||
~~~~~~~~~~~~
|
||||
|
||||
* `Tecnativa <https://www.tecnativa.com>`_:
|
||||
* Víctor Martínez
|
||||
* Pedro M. Baeza
|
||||
|
||||
Maintainers
|
||||
~~~~~~~~~~~
|
||||
|
||||
This module is maintained by the OCA.
|
||||
|
||||
.. image:: https://odoo-community.org/logo.png
|
||||
:alt: Odoo Community Association
|
||||
:target: https://odoo-community.org
|
||||
|
||||
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.
|
||||
|
||||
.. |maintainer-victoralmau| image:: https://github.com/victoralmau.png?size=40px
|
||||
:target: https://github.com/victoralmau
|
||||
:alt: victoralmau
|
||||
|
||||
Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
|
||||
|
||||
|maintainer-victoralmau|
|
||||
|
||||
This module is part of the `OCA/account-reconcile <https://github.com/OCA/account-reconcile/tree/16.0/account_reconcile_analytic_tag>`_ project on GitHub.
|
||||
|
||||
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
|
||||
|
|
@ -0,0 +1 @@
|
|||
from . import models
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
# Copyright 2024 Tecnativa - Víctor Martínez
|
||||
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
|
||||
{
|
||||
"name": "Analytic tags in account reconciliation",
|
||||
"author": "Tecnativa, Odoo Community Association (OCA)",
|
||||
"website": "https://github.com/OCA/account-reconcile",
|
||||
"version": "16.0.1.0.0",
|
||||
"depends": ["account_reconcile_oca", "account_analytic_tag"],
|
||||
"license": "AGPL-3",
|
||||
"category": "Accounting",
|
||||
"installable": True,
|
||||
"maintainers": ["victoralmau"],
|
||||
"data": [
|
||||
"views/account_bank_statement_line_views.xml",
|
||||
],
|
||||
}
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
# Translation of Odoo Server.
|
||||
# This file contains the translation of the following modules:
|
||||
# * account_reconcile_analytic_tag
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 16.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2024-11-26 15:08+0000\n"
|
||||
"PO-Revision-Date: 2024-11-26 15:08+0000\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
"Plural-Forms: \n"
|
||||
|
||||
#. module: account_reconcile_analytic_tag
|
||||
#: model:ir.model,name:account_reconcile_analytic_tag.model_account_reconcile_abstract
|
||||
msgid "Account Reconcile Abstract"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_reconcile_analytic_tag
|
||||
#: model:ir.model.fields,field_description:account_reconcile_analytic_tag.field_account_bank_statement_line__manual_analytic_tag_ids
|
||||
msgid "Analytic Tags"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_reconcile_analytic_tag
|
||||
#: model:ir.model,name:account_reconcile_analytic_tag.model_account_bank_statement_line
|
||||
msgid "Bank Statement Line"
|
||||
msgstr ""
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
# Translation of Odoo Server.
|
||||
# This file contains the translation of the following modules:
|
||||
# * account_reconcile_analytic_tag
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 16.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2024-11-26 15:08+0000\n"
|
||||
"PO-Revision-Date: 2024-11-26 16:08+0100\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"Language: es\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: \n"
|
||||
"X-Generator: Poedit 3.0.1\n"
|
||||
|
||||
#. module: account_reconcile_analytic_tag
|
||||
#: model:ir.model,name:account_reconcile_analytic_tag.model_account_reconcile_abstract
|
||||
msgid "Account Reconcile Abstract"
|
||||
msgstr "Resumen de conciliación de cuenta"
|
||||
|
||||
#. module: account_reconcile_analytic_tag
|
||||
#: model:ir.model.fields,field_description:account_reconcile_analytic_tag.field_account_bank_statement_line__manual_analytic_tag_ids
|
||||
msgid "Analytic Tags"
|
||||
msgstr "Etiquetas analíticas"
|
||||
|
||||
#. module: account_reconcile_analytic_tag
|
||||
#: model:ir.model,name:account_reconcile_analytic_tag.model_account_bank_statement_line
|
||||
msgid "Bank Statement Line"
|
||||
msgstr "Línea de extracto bancario"
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
from . import account_reconcile_abstract
|
||||
from . import account_bank_statement_line
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
# Copyright 2024 Tecnativa - Víctor Martínez
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
|
||||
from odoo import api, fields, models
|
||||
|
||||
|
||||
class AccountBankStatementLine(models.Model):
|
||||
_inherit = "account.bank.statement.line"
|
||||
|
||||
manual_analytic_tag_ids = fields.Many2many(
|
||||
comodel_name="account.analytic.tag",
|
||||
string="Analytic Tags",
|
||||
domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]",
|
||||
)
|
||||
|
||||
def _get_manual_delete_vals(self):
|
||||
vals = super()._get_manual_delete_vals()
|
||||
vals["manual_analytic_tag_ids"] = False
|
||||
return vals
|
||||
|
||||
def _process_manual_reconcile_from_line(self, line):
|
||||
res = super()._process_manual_reconcile_from_line(line)
|
||||
self.manual_analytic_tag_ids = line.get("manual_analytic_tag_ids")
|
||||
return res
|
||||
|
||||
def _get_manual_reconcile_vals(self):
|
||||
vals = super()._get_manual_reconcile_vals()
|
||||
vals["manual_analytic_tag_ids"] = [(6, 0, self.manual_analytic_tag_ids.ids)]
|
||||
return vals
|
||||
|
||||
@api.onchange("manual_analytic_tag_ids")
|
||||
def _onchange_analytic_tag_ids(self):
|
||||
return super()._onchange_manual_reconcile_vals()
|
||||
|
||||
def _reconcile_move_line_vals(self, line, move_id=False):
|
||||
vals = super()._reconcile_move_line_vals(line=line, move_id=move_id)
|
||||
vals["analytic_tag_ids"] = line.get("manual_analytic_tag_ids")
|
||||
return vals
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
# Copyright 2024 Tecnativa - Víctor Martínez
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
|
||||
from odoo import models
|
||||
|
||||
|
||||
class AccountReconcileAbstract(models.AbstractModel):
|
||||
_inherit = "account.reconcile.abstract"
|
||||
|
||||
def _get_reconcile_line(
|
||||
self, line, kind, is_counterpart=False, max_amount=False, from_unreconcile=False
|
||||
):
|
||||
vals = super()._get_reconcile_line(
|
||||
line=line,
|
||||
kind=kind,
|
||||
is_counterpart=is_counterpart,
|
||||
max_amount=max_amount,
|
||||
from_unreconcile=from_unreconcile,
|
||||
)
|
||||
vals[0]["manual_analytic_tag_ids"] = [(6, 0, line.analytic_tag_ids.ids)]
|
||||
return vals
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
* `Tecnativa <https://www.tecnativa.com>`_:
|
||||
* Víctor Martínez
|
||||
* Pedro M. Baeza
|
||||
|
|
@ -0,0 +1 @@
|
|||
This module adds the analytical tags to the bank reconciliation.
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 9.2 KiB |
|
|
@ -0,0 +1,424 @@
|
|||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
|
||||
<title>Analytic tags in account reconciliation</title>
|
||||
<style type="text/css">
|
||||
|
||||
/*
|
||||
:Author: David Goodger (goodger@python.org)
|
||||
: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.
|
||||
|
||||
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
|
||||
customize this style sheet.
|
||||
*/
|
||||
|
||||
/* used to remove borders from tables and images */
|
||||
.borderless, table.borderless td, table.borderless th {
|
||||
border: 0 }
|
||||
|
||||
table.borderless td, table.borderless th {
|
||||
/* Override padding for "table.docutils td" with "! important".
|
||||
The right padding separates the table cells. */
|
||||
padding: 0 0.5em 0 0 ! important }
|
||||
|
||||
.first {
|
||||
/* Override more specific margin styles with "! important". */
|
||||
margin-top: 0 ! important }
|
||||
|
||||
.last, .with-subtitle {
|
||||
margin-bottom: 0 ! important }
|
||||
|
||||
.hidden {
|
||||
display: none }
|
||||
|
||||
.subscript {
|
||||
vertical-align: sub;
|
||||
font-size: smaller }
|
||||
|
||||
.superscript {
|
||||
vertical-align: super;
|
||||
font-size: smaller }
|
||||
|
||||
a.toc-backref {
|
||||
text-decoration: none ;
|
||||
color: black }
|
||||
|
||||
blockquote.epigraph {
|
||||
margin: 2em 5em ; }
|
||||
|
||||
dl.docutils dd {
|
||||
margin-bottom: 0.5em }
|
||||
|
||||
object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* Uncomment (and remove this text!) to get bold-faced definition list terms
|
||||
dl.docutils dt {
|
||||
font-weight: bold }
|
||||
*/
|
||||
|
||||
div.abstract {
|
||||
margin: 2em 5em }
|
||||
|
||||
div.abstract p.topic-title {
|
||||
font-weight: bold ;
|
||||
text-align: center }
|
||||
|
||||
div.admonition, div.attention, div.caution, div.danger, div.error,
|
||||
div.hint, div.important, div.note, div.tip, div.warning {
|
||||
margin: 2em ;
|
||||
border: medium outset ;
|
||||
padding: 1em }
|
||||
|
||||
div.admonition p.admonition-title, div.hint p.admonition-title,
|
||||
div.important p.admonition-title, div.note p.admonition-title,
|
||||
div.tip p.admonition-title {
|
||||
font-weight: bold ;
|
||||
font-family: sans-serif }
|
||||
|
||||
div.attention p.admonition-title, div.caution p.admonition-title,
|
||||
div.danger p.admonition-title, div.error p.admonition-title,
|
||||
div.warning p.admonition-title, .code .error {
|
||||
color: red ;
|
||||
font-weight: bold ;
|
||||
font-family: sans-serif }
|
||||
|
||||
/* Uncomment (and remove this text!) to get reduced vertical space in
|
||||
compound paragraphs.
|
||||
div.compound .compound-first, div.compound .compound-middle {
|
||||
margin-bottom: 0.5em }
|
||||
|
||||
div.compound .compound-last, div.compound .compound-middle {
|
||||
margin-top: 0.5em }
|
||||
*/
|
||||
|
||||
div.dedication {
|
||||
margin: 2em 5em ;
|
||||
text-align: center ;
|
||||
font-style: italic }
|
||||
|
||||
div.dedication p.topic-title {
|
||||
font-weight: bold ;
|
||||
font-style: normal }
|
||||
|
||||
div.figure {
|
||||
margin-left: 2em ;
|
||||
margin-right: 2em }
|
||||
|
||||
div.footer, div.header {
|
||||
clear: both;
|
||||
font-size: smaller }
|
||||
|
||||
div.line-block {
|
||||
display: block ;
|
||||
margin-top: 1em ;
|
||||
margin-bottom: 1em }
|
||||
|
||||
div.line-block div.line-block {
|
||||
margin-top: 0 ;
|
||||
margin-bottom: 0 ;
|
||||
margin-left: 1.5em }
|
||||
|
||||
div.sidebar {
|
||||
margin: 0 0 0.5em 1em ;
|
||||
border: medium outset ;
|
||||
padding: 1em ;
|
||||
background-color: #ffffee ;
|
||||
width: 40% ;
|
||||
float: right ;
|
||||
clear: right }
|
||||
|
||||
div.sidebar p.rubric {
|
||||
font-family: sans-serif ;
|
||||
font-size: medium }
|
||||
|
||||
div.system-messages {
|
||||
margin: 5em }
|
||||
|
||||
div.system-messages h1 {
|
||||
color: red }
|
||||
|
||||
div.system-message {
|
||||
border: medium outset ;
|
||||
padding: 1em }
|
||||
|
||||
div.system-message p.system-message-title {
|
||||
color: red ;
|
||||
font-weight: bold }
|
||||
|
||||
div.topic {
|
||||
margin: 2em }
|
||||
|
||||
h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
|
||||
h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
|
||||
margin-top: 0.4em }
|
||||
|
||||
h1.title {
|
||||
text-align: center }
|
||||
|
||||
h2.subtitle {
|
||||
text-align: center }
|
||||
|
||||
hr.docutils {
|
||||
width: 75% }
|
||||
|
||||
img.align-left, .figure.align-left, object.align-left, table.align-left {
|
||||
clear: left ;
|
||||
float: left ;
|
||||
margin-right: 1em }
|
||||
|
||||
img.align-right, .figure.align-right, object.align-right, table.align-right {
|
||||
clear: right ;
|
||||
float: right ;
|
||||
margin-left: 1em }
|
||||
|
||||
img.align-center, .figure.align-center, object.align-center {
|
||||
display: block;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
}
|
||||
|
||||
table.align-center {
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
}
|
||||
|
||||
.align-left {
|
||||
text-align: left }
|
||||
|
||||
.align-center {
|
||||
clear: both ;
|
||||
text-align: center }
|
||||
|
||||
.align-right {
|
||||
text-align: right }
|
||||
|
||||
/* reset inner alignment in figures */
|
||||
div.align-right {
|
||||
text-align: inherit }
|
||||
|
||||
/* div.align-center * { */
|
||||
/* text-align: left } */
|
||||
|
||||
.align-top {
|
||||
vertical-align: top }
|
||||
|
||||
.align-middle {
|
||||
vertical-align: middle }
|
||||
|
||||
.align-bottom {
|
||||
vertical-align: bottom }
|
||||
|
||||
ol.simple, ul.simple {
|
||||
margin-bottom: 1em }
|
||||
|
||||
ol.arabic {
|
||||
list-style: decimal }
|
||||
|
||||
ol.loweralpha {
|
||||
list-style: lower-alpha }
|
||||
|
||||
ol.upperalpha {
|
||||
list-style: upper-alpha }
|
||||
|
||||
ol.lowerroman {
|
||||
list-style: lower-roman }
|
||||
|
||||
ol.upperroman {
|
||||
list-style: upper-roman }
|
||||
|
||||
p.attribution {
|
||||
text-align: right ;
|
||||
margin-left: 50% }
|
||||
|
||||
p.caption {
|
||||
font-style: italic }
|
||||
|
||||
p.credits {
|
||||
font-style: italic ;
|
||||
font-size: smaller }
|
||||
|
||||
p.label {
|
||||
white-space: nowrap }
|
||||
|
||||
p.rubric {
|
||||
font-weight: bold ;
|
||||
font-size: larger ;
|
||||
color: maroon ;
|
||||
text-align: center }
|
||||
|
||||
p.sidebar-title {
|
||||
font-family: sans-serif ;
|
||||
font-weight: bold ;
|
||||
font-size: larger }
|
||||
|
||||
p.sidebar-subtitle {
|
||||
font-family: sans-serif ;
|
||||
font-weight: bold }
|
||||
|
||||
p.topic-title {
|
||||
font-weight: bold }
|
||||
|
||||
pre.address {
|
||||
margin-bottom: 0 ;
|
||||
margin-top: 0 ;
|
||||
font: inherit }
|
||||
|
||||
pre.literal-block, pre.doctest-block, pre.math, pre.code {
|
||||
margin-left: 2em ;
|
||||
margin-right: 2em }
|
||||
|
||||
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 }
|
||||
pre.code .literal.string, code .literal.string { color: #0C5404 }
|
||||
pre.code .name.builtin, code .name.builtin { color: #352B84 }
|
||||
pre.code .deleted, code .deleted { background-color: #DEB0A1}
|
||||
pre.code .inserted, code .inserted { background-color: #A3D289}
|
||||
|
||||
span.classifier {
|
||||
font-family: sans-serif ;
|
||||
font-style: oblique }
|
||||
|
||||
span.classifier-delimiter {
|
||||
font-family: sans-serif ;
|
||||
font-weight: bold }
|
||||
|
||||
span.interpreted {
|
||||
font-family: sans-serif }
|
||||
|
||||
span.option {
|
||||
white-space: nowrap }
|
||||
|
||||
span.pre {
|
||||
white-space: pre }
|
||||
|
||||
span.problematic {
|
||||
color: red }
|
||||
|
||||
span.section-subtitle {
|
||||
/* font-size relative to parent (h1..h6 element) */
|
||||
font-size: 80% }
|
||||
|
||||
table.citation {
|
||||
border-left: solid 1px gray;
|
||||
margin-left: 1px }
|
||||
|
||||
table.docinfo {
|
||||
margin: 2em 4em }
|
||||
|
||||
table.docutils {
|
||||
margin-top: 0.5em ;
|
||||
margin-bottom: 0.5em }
|
||||
|
||||
table.footnote {
|
||||
border-left: solid 1px black;
|
||||
margin-left: 1px }
|
||||
|
||||
table.docutils td, table.docutils th,
|
||||
table.docinfo td, table.docinfo th {
|
||||
padding-left: 0.5em ;
|
||||
padding-right: 0.5em ;
|
||||
vertical-align: top }
|
||||
|
||||
table.docutils th.field-name, table.docinfo th.docinfo-name {
|
||||
font-weight: bold ;
|
||||
text-align: left ;
|
||||
white-space: nowrap ;
|
||||
padding-left: 0 }
|
||||
|
||||
/* "booktabs" style (no vertical lines) */
|
||||
table.docutils.booktabs {
|
||||
border: 0px;
|
||||
border-top: 2px solid;
|
||||
border-bottom: 2px solid;
|
||||
border-collapse: collapse;
|
||||
}
|
||||
table.docutils.booktabs * {
|
||||
border: 0px;
|
||||
}
|
||||
table.docutils.booktabs th {
|
||||
border-bottom: thin solid;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
|
||||
h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
|
||||
font-size: 100% }
|
||||
|
||||
ul.auto-toc {
|
||||
list-style-type: none }
|
||||
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="document" id="analytic-tags-in-account-reconciliation">
|
||||
<h1 class="title">Analytic tags in account reconciliation</h1>
|
||||
|
||||
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
!! This file is generated by oca-gen-addon-readme !!
|
||||
!! changes will be overwritten. !!
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
!! source digest: sha256:5e65f5558294201ee5178e15be3ac2f796fbc6560fa805c6a72486cd4b57df0d
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
|
||||
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/account-reconcile/tree/16.0/account_reconcile_analytic_tag"><img alt="OCA/account-reconcile" src="https://img.shields.io/badge/github-OCA%2Faccount--reconcile-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/account-reconcile-16-0/account-reconcile-16-0-account_reconcile_analytic_tag"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/account-reconcile&target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
|
||||
<p>This module adds the analytical tags to the bank reconciliation.</p>
|
||||
<p><strong>Table of contents</strong></p>
|
||||
<div class="contents local topic" id="contents">
|
||||
<ul class="simple">
|
||||
<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
|
||||
<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
|
||||
<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
|
||||
<li><a class="reference internal" href="#contributors" id="toc-entry-4">Contributors</a></li>
|
||||
<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="section" id="bug-tracker">
|
||||
<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
|
||||
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/account-reconcile/issues">GitHub Issues</a>.
|
||||
In case of trouble, please check there if your issue has already been reported.
|
||||
If you spotted it first, help us to smash it by providing a detailed and welcomed
|
||||
<a class="reference external" href="https://github.com/OCA/account-reconcile/issues/new?body=module:%20account_reconcile_analytic_tag%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
|
||||
<p>Do not contact contributors directly about support or help with technical issues.</p>
|
||||
</div>
|
||||
<div class="section" id="credits">
|
||||
<h1><a class="toc-backref" href="#toc-entry-2">Credits</a></h1>
|
||||
<div class="section" id="authors">
|
||||
<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
|
||||
<ul class="simple">
|
||||
<li>Tecnativa</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="section" id="contributors">
|
||||
<h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
|
||||
<ul class="simple">
|
||||
<li><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>:
|
||||
* Víctor Martínez
|
||||
* Pedro M. Baeza</li>
|
||||
</ul>
|
||||
</div>
|
||||
<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"><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>
|
||||
<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
|
||||
<p><a class="reference external image-reference" href="https://github.com/victoralmau"><img alt="victoralmau" src="https://github.com/victoralmau.png?size=40px" /></a></p>
|
||||
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/account-reconcile/tree/16.0/account_reconcile_analytic_tag">OCA/account-reconcile</a> project on GitHub.</p>
|
||||
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
# Copyright 2024 Tecnativa - Víctor Martínez
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
from . import test_account_reconcile_analytic_tag
|
||||
|
|
@ -0,0 +1,83 @@
|
|||
# Copyright 2024 Tecnativa - Víctor Martínez
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
import time
|
||||
|
||||
from odoo.tests import Form, tagged
|
||||
|
||||
from odoo.addons.account.tests.common import TestAccountReconciliationCommon
|
||||
|
||||
|
||||
@tagged("post_install", "-at_install")
|
||||
class TestAccountReconcileAnalyticTag(TestAccountReconciliationCommon):
|
||||
@classmethod
|
||||
def setUpClass(cls, chart_template_ref=None):
|
||||
super().setUpClass(chart_template_ref=chart_template_ref)
|
||||
cls.env.user.groups_id += cls.env.ref("analytic.group_analytic_accounting")
|
||||
cls.env.user.groups_id += cls.env.ref(
|
||||
"account_analytic_tag.group_analytic_tags"
|
||||
)
|
||||
bank_stmt = cls.env["account.bank.statement"].create(
|
||||
{
|
||||
"company_id": cls.env.company.id,
|
||||
"journal_id": cls.bank_journal_euro.id,
|
||||
"date": time.strftime("%Y-07-15"),
|
||||
"name": "test",
|
||||
}
|
||||
)
|
||||
cls.bank_stmt_line = cls.env["account.bank.statement.line"].create(
|
||||
{
|
||||
"name": "testLine",
|
||||
"journal_id": cls.bank_journal_euro.id,
|
||||
"statement_id": bank_stmt.id,
|
||||
"amount": 50,
|
||||
"date": time.strftime("%Y-07-15"),
|
||||
}
|
||||
)
|
||||
cls.plan = cls.env["account.analytic.plan"].create(
|
||||
{
|
||||
"name": "Test Plan",
|
||||
"company_id": False,
|
||||
}
|
||||
)
|
||||
cls.analytic_account = cls.env["account.analytic.account"].create(
|
||||
{
|
||||
"name": "Test account",
|
||||
"plan_id": cls.plan.id,
|
||||
},
|
||||
)
|
||||
cls.analytic_tag = cls.env["account.analytic.tag"].create({"name": "Test tag"})
|
||||
|
||||
def test_account_reconcile_manual_with_tags(self):
|
||||
reconcile_data = self.bank_stmt_line._default_reconcile_data()
|
||||
data = reconcile_data["data"][1]
|
||||
self.bank_stmt_line.manual_reference = data["reference"]
|
||||
self.bank_stmt_line._process_manual_reconcile_from_line(data)
|
||||
line_form = Form(
|
||||
self.bank_stmt_line,
|
||||
view="account_reconcile_oca.bank_statement_line_form_reconcile_view",
|
||||
)
|
||||
line_form.manual_partner_id = self.partner_a
|
||||
line_form.analytic_distribution = {str(self.analytic_account.id): 100}
|
||||
line_form.manual_analytic_tag_ids.add(self.analytic_tag)
|
||||
line_form.save()
|
||||
self.bank_stmt_line.reconcile_bank_line()
|
||||
analytic_line = self.bank_stmt_line.move_id.line_ids.analytic_line_ids
|
||||
self.assertEqual(
|
||||
analytic_line.tag_ids, self.bank_stmt_line.manual_analytic_tag_ids
|
||||
)
|
||||
|
||||
def test_account_reconcile_manual_without_tags(self):
|
||||
reconcile_data = self.bank_stmt_line._default_reconcile_data()
|
||||
data = reconcile_data["data"][1]
|
||||
self.bank_stmt_line.manual_reference = data["reference"]
|
||||
self.bank_stmt_line._process_manual_reconcile_from_line(data)
|
||||
line_form = Form(
|
||||
self.bank_stmt_line,
|
||||
view="account_reconcile_oca.bank_statement_line_form_reconcile_view",
|
||||
)
|
||||
line_form.manual_partner_id = self.partner_a
|
||||
line_form.analytic_distribution = {str(self.analytic_account.id): 100}
|
||||
line_form.save()
|
||||
self.bank_stmt_line.reconcile_bank_line()
|
||||
analytic_line = self.bank_stmt_line.move_id.line_ids.analytic_line_ids
|
||||
self.assertFalse(analytic_line.tag_ids)
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<odoo>
|
||||
<record id="bank_statement_line_form_reconcile_view" model="ir.ui.view">
|
||||
<field name="name">account.bank.statement.line.reconcile</field>
|
||||
<field name="model">account.bank.statement.line</field>
|
||||
<field
|
||||
name="inherit_id"
|
||||
ref="account_reconcile_oca.bank_statement_line_form_reconcile_view"
|
||||
/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath
|
||||
expr="//page[@name='manual']//field[@name='analytic_distribution']"
|
||||
position="after"
|
||||
>
|
||||
<field
|
||||
name="manual_analytic_tag_ids"
|
||||
groups="account_analytic_tag.group_analytic_tags"
|
||||
widget="many2many_tags"
|
||||
attrs="{'invisible': ['|', ('manual_kind', '=', 'liquidity'), ('manual_reference', '=', False)], 'readonly': [('is_reconciled', '=', True)]}"
|
||||
/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
</odoo>
|
||||
|
|
@ -296,6 +296,46 @@ class AccountBankStatementLine(models.Model):
|
|||
!= line.get("partner_id")
|
||||
)
|
||||
|
||||
def _get_manual_delete_vals(self):
|
||||
return {
|
||||
"manual_reference": False,
|
||||
"manual_account_id": False,
|
||||
"manual_amount": False,
|
||||
"manual_exchange_counterpart": False,
|
||||
"manual_in_currency_id": False,
|
||||
"manual_in_currency": False,
|
||||
"manual_name": False,
|
||||
"manual_partner_id": False,
|
||||
"manual_line_id": False,
|
||||
"manual_move_id": False,
|
||||
"manual_move_type": False,
|
||||
"manual_kind": False,
|
||||
"manual_original_amount": False,
|
||||
"manual_currency_id": False,
|
||||
"analytic_distribution": False,
|
||||
}
|
||||
|
||||
def _process_manual_reconcile_from_line(self, line):
|
||||
self.manual_account_id = line["account_id"][0]
|
||||
self.manual_amount = line["amount"]
|
||||
self.manual_currency_id = line["currency_id"]
|
||||
self.manual_in_currency_id = line.get("line_currency_id")
|
||||
self.manual_in_currency = line.get("line_currency_id") and line[
|
||||
"currency_id"
|
||||
] != line.get("line_currency_id")
|
||||
self.manual_amount_in_currency = line.get("currency_amount")
|
||||
self.manual_name = line["name"]
|
||||
self.manual_exchange_counterpart = line.get("is_exchange_counterpart", False)
|
||||
self.manual_partner_id = line.get("partner_id") and line["partner_id"][0]
|
||||
manual_line = self.env["account.move.line"].browse(line["id"]).exists()
|
||||
self.manual_line_id = manual_line
|
||||
self.analytic_distribution = line.get("analytic_distribution", {})
|
||||
if self.manual_line_id:
|
||||
self.manual_move_id = self.manual_line_id.move_id
|
||||
self.manual_move_type = self.manual_line_id.move_id.move_type
|
||||
self.manual_kind = line["kind"]
|
||||
self.manual_original_amount = line.get("original_amount", 0.0)
|
||||
|
||||
@api.onchange("manual_reference", "manual_delete")
|
||||
def _onchange_manual_reconcile_reference(self):
|
||||
self.ensure_one()
|
||||
|
|
@ -316,53 +356,10 @@ class AccountBankStatementLine(models.Model):
|
|||
continue
|
||||
if line["reference"] == self.manual_reference:
|
||||
if self.manual_delete:
|
||||
self.update(
|
||||
{
|
||||
"manual_reference": False,
|
||||
"manual_account_id": False,
|
||||
"manual_amount": False,
|
||||
"manual_exchange_counterpart": False,
|
||||
"manual_in_currency_id": False,
|
||||
"manual_in_currency": False,
|
||||
"manual_name": False,
|
||||
"manual_partner_id": False,
|
||||
"manual_line_id": False,
|
||||
"manual_move_id": False,
|
||||
"manual_move_type": False,
|
||||
"manual_kind": False,
|
||||
"manual_original_amount": False,
|
||||
"manual_currency_id": False,
|
||||
"analytic_distribution": False,
|
||||
"manual_amount_in_currency": False,
|
||||
}
|
||||
)
|
||||
self.update(self._get_manual_delete_vals())
|
||||
continue
|
||||
else:
|
||||
self.manual_account_id = line["account_id"][0]
|
||||
self.manual_amount = line["amount"]
|
||||
self.manual_currency_id = line["currency_id"]
|
||||
self.manual_in_currency_id = line.get("line_currency_id")
|
||||
self.manual_in_currency = line.get("line_currency_id") and line[
|
||||
"currency_id"
|
||||
] != line.get("line_currency_id")
|
||||
self.manual_amount_in_currency = line.get("currency_amount")
|
||||
self.manual_name = line["name"]
|
||||
self.manual_exchange_counterpart = line.get(
|
||||
"is_exchange_counterpart", False
|
||||
)
|
||||
self.manual_partner_id = (
|
||||
line.get("partner_id") and line["partner_id"][0]
|
||||
)
|
||||
manual_line = (
|
||||
self.env["account.move.line"].browse(line["id"]).exists()
|
||||
)
|
||||
self.manual_line_id = manual_line
|
||||
self.analytic_distribution = line.get("analytic_distribution", {})
|
||||
if self.manual_line_id:
|
||||
self.manual_move_id = self.manual_line_id.move_id
|
||||
self.manual_move_type = self.manual_line_id.move_id.move_type
|
||||
self.manual_kind = line["kind"]
|
||||
self.manual_original_amount = line.get("original_amount", 0.0)
|
||||
self._process_manual_reconcile_from_line(line)
|
||||
new_data.append(line)
|
||||
self.update({"manual_delete": False})
|
||||
self.reconcile_data_info = self._recompute_suspense_line(
|
||||
|
|
@ -383,6 +380,21 @@ class AccountBankStatementLine(models.Model):
|
|||
)
|
||||
self._onchange_manual_reconcile_vals()
|
||||
|
||||
def _get_manual_reconcile_vals(self):
|
||||
return {
|
||||
"name": self.manual_name,
|
||||
"partner_id": self.manual_partner_id
|
||||
and self.manual_partner_id.name_get()[0]
|
||||
or (False, self.partner_name),
|
||||
"account_id": self.manual_account_id.name_get()[0]
|
||||
if self.manual_account_id
|
||||
else [False, _("Undefined")],
|
||||
"amount": self.manual_amount,
|
||||
"credit": -self.manual_amount if self.manual_amount < 0 else 0.0,
|
||||
"debit": self.manual_amount if self.manual_amount > 0 else 0.0,
|
||||
"analytic_distribution": self.analytic_distribution,
|
||||
}
|
||||
|
||||
@api.onchange(
|
||||
"manual_account_id",
|
||||
"manual_partner_id",
|
||||
|
|
@ -397,28 +409,11 @@ class AccountBankStatementLine(models.Model):
|
|||
for line in data:
|
||||
if line["reference"] == self.manual_reference:
|
||||
if self._check_line_changed(line):
|
||||
line.update(
|
||||
{
|
||||
"name": self.manual_name,
|
||||
"partner_id": self.manual_partner_id
|
||||
and self.manual_partner_id.name_get()[0]
|
||||
or (False, self.partner_name),
|
||||
"account_id": self.manual_account_id.name_get()[0]
|
||||
if self.manual_account_id
|
||||
else [False, _("Undefined")],
|
||||
"amount": self.manual_amount,
|
||||
"credit": -self.manual_amount
|
||||
if self.manual_amount < 0
|
||||
else 0.0,
|
||||
"debit": self.manual_amount
|
||||
if self.manual_amount > 0
|
||||
else 0.0,
|
||||
"analytic_distribution": self.analytic_distribution,
|
||||
"kind": line["kind"]
|
||||
if line["kind"] != "suspense"
|
||||
else "other",
|
||||
}
|
||||
line_vals = self._get_manual_reconcile_vals()
|
||||
line_vals["kind"] = (
|
||||
line["kind"] if line["kind"] != "suspense" else "other"
|
||||
)
|
||||
line.update(line_vals)
|
||||
if line["kind"] == "liquidity":
|
||||
self._update_move_partner()
|
||||
if self.manual_line_id and self.manual_line_id.id == line.get(
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
../../../../account_reconcile_analytic_tag
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
import setuptools
|
||||
|
||||
setuptools.setup(
|
||||
setup_requires=['setuptools-odoo'],
|
||||
odoo_addon=True,
|
||||
)
|
||||
Loading…
Reference in New Issue