Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[16.0][MIG]l10n_it_riba_sale_commission: migration to v16 #4403

Open
wants to merge 24 commits into
base: 16.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
dd1c0bf
[14.0][ADD] l10n_it_riba_sale_commission
odooNextev Mar 22, 2023
6791713
[UPD] Update l10n_it_riba_sale_commission.pot
Apr 28, 2023
c8930ba
[UPD] README.rst
OCA-git-bot Apr 28, 2023
9ee7412
Translated using Weblate (Italian)
mymage May 1, 2023
446c5ea
Translated using Weblate (Italian)
francesco-ooops Jun 5, 2023
09e9e55
[UPD] README.rst
OCA-git-bot Sep 3, 2023
60caaf6
[IMP]l10n_it_riba_sale_commission: use payment date
odooNextev Aug 25, 2023
4fa9bf5
[UPD] Update l10n_it_riba_sale_commission.pot
Oct 13, 2023
28f9e43
[BOT] post-merge updates
OCA-git-bot Oct 13, 2023
f74bb6d
Update translation files
weblate Oct 13, 2023
c430d41
Translated using Weblate (Italian)
francesco-ooops Oct 13, 2023
e1a9a0e
Translated using Weblate (Italian)
francesco-ooops Dec 14, 2023
0e93b3f
[IMP]l10n_it_riba_sale_commission:partial commission settlement
matteonext Nov 30, 2023
660e03d
[BOT] post-merge updates
OCA-git-bot Jan 9, 2024
aa2b5e8
[IMP] l10n_it_riba_sale_commission: use wizard's payment date
renda-dev Jul 19, 2024
7b55416
[IMP] l10n_it_riba_sale_commission: add maintainers
renda-dev Jul 22, 2024
98f5925
[UPD] Update l10n_it_riba_sale_commission.pot
Jul 22, 2024
73c06f0
[BOT] post-merge updates
OCA-git-bot Jul 22, 2024
723af9d
Update translation files
weblate Jul 22, 2024
804dc4d
Translated using Weblate (Italian)
francesco-ooops Jul 23, 2024
92b77cf
[IMP]l10n_it_riba_sale_commission: cherry pick
matteonext Oct 14, 2024
ea06478
[MIG]l10n_it_riba_sale_commission: migrazion to v16
matteonext Oct 14, 2024
79c21d2
[IMP]l10n_it_riba_sale_commission:fix tests
matteonext Dec 6, 2024
7949bbe
[IMP]l10n_it_riba_sale_commission:fix test-requirements as provided i…
matteonext Dec 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 127 additions & 0 deletions l10n_it_riba_sale_commission/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
====================================================
ITA - Integrazione tra RiBa e provvigioni su vendite
====================================================

..
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:f25aec3a157af1534a63bf3318d12c1f65f2fd5b8c8f60346f6f209ff3109d63
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
:target: https://odoo-community.org/page/development-status
:alt: Alpha
.. |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%2Fl10n--italy-lightgray.png?logo=github
:target: https://github.com/OCA/l10n-italy/tree/16.0/l10n_it_riba_sale_commission
:alt: OCA/l10n-italy
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/l10n-italy-16-0/l10n-italy-16-0-l10n_it_riba_sale_commission
: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/l10n-italy&target_branch=16.0
:alt: Try me on Runboat

|badge1| |badge2| |badge3| |badge4| |badge5|

**Italiano**

Il modulo permette di integrare il pagamento RiBa con le provvigioni
agenti.

Nella generazione delle provvigioni agente, una fattura con termini di
pagamento RiBa ed emissione con tipologia "Salvo buon fine" verrà presa
in considerazione solamente trascorsi il numero di giorni impostati nel
campo "Giorni di sicurezza" nella configurazione RiBa. Il filtro per la
data di pagamento, nel caso di un pagamento Riba, scarterà tutti i
pagamenti dove non sono passati almeno i "Giorni di sicurezza" rispetto
alla data di scadenza.

È possibile impostare la spunta su "Senza provvigioni" nelle fatture, in
modo che non vengano generate provvigioni agente.

**English**

The module allows you to integrate the RiBa payment with agent
commissions.

When generating agent commissions, an invoice with RiBa payment terms
and "Subject To Collection" type issue will be taken into consideration
only after the number of days set in the "Safety Days" field in RiBa
configuration. The payment date filter, in the case of a Riba payment,
will exclude all payments where at least the "Safety Days" have not
passed from the due date.

It is possible to set "Without commissions" flag in invoices, in this
way no agent commissions are generated.

.. IMPORTANT::
This is an alpha version, the data model and design can change at any time without warning.
Only for development or testing purpose, do not use in production.
`More details on development status <https://odoo-community.org/page/development-status>`_

**Table of contents**

.. contents::
:local:

Bug Tracker
===========

Bugs are tracked on `GitHub Issues <https://github.com/OCA/l10n-italy/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/l10n-italy/issues/new?body=module:%20l10n_it_riba_sale_commission%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
-------

* Nextev Srl

Contributors
------------

- Nextev Srl <[email protected]>

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-odooNextev| image:: https://github.com/odooNextev.png?size=40px
:target: https://github.com/odooNextev
:alt: odooNextev
.. |maintainer-aleuffre| image:: https://github.com/aleuffre.png?size=40px
:target: https://github.com/aleuffre
:alt: aleuffre
.. |maintainer-renda-dev| image:: https://github.com/renda-dev.png?size=40px
:target: https://github.com/renda-dev
:alt: renda-dev
.. |maintainer-PicchiSeba| image:: https://github.com/PicchiSeba.png?size=40px
:target: https://github.com/PicchiSeba
:alt: PicchiSeba

Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:

|maintainer-odooNextev| |maintainer-aleuffre| |maintainer-renda-dev| |maintainer-PicchiSeba|

This module is part of the `OCA/l10n-italy <https://github.com/OCA/l10n-italy/tree/16.0/l10n_it_riba_sale_commission>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
4 changes: 4 additions & 0 deletions l10n_it_riba_sale_commission/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).

from . import models
from . import wizard
22 changes: 22 additions & 0 deletions l10n_it_riba_sale_commission/__manifest__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
{
"name": "ITA - Integrazione tra RiBa e provvigioni su vendite",
"summary": "Modulo ponte tra provvigioni agenti e RiBa",
"version": "16.0.1.0.0",
"development_status": "Alpha",
"category": "Localization/Italy",
"website": "https://github.com/OCA/l10n-italy",
"author": "Nextev Srl, Odoo Community Association (OCA)",
"maintainers": ["odooNextev", "aleuffre", "renda-dev", "PicchiSeba"],
"license": "AGPL-3",
"application": False,
"installable": True,
"depends": [
"sale_commission_partial_settlement",
"l10n_it_riba",
],
"data": [
"views/invoice_no_commission.xml",
"views/configuration_riba_view.xml",
],
}
83 changes: 83 additions & 0 deletions l10n_it_riba_sale_commission/i18n/it.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * l10n_it_riba_sale_commission
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 12.0+e\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-03-07 10:09+0000\n"
"PO-Revision-Date: 2024-07-23 11:58+0000\n"
"Last-Translator: Francesco Foresti <[email protected]>\n"
"Language-Team: \n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 5.6.2\n"

#. module: l10n_it_riba_sale_commission
#: model:ir.model,name:l10n_it_riba_sale_commission.model_account_invoice_line_agent
msgid "Agent detail of commission line in invoice lines"
msgstr "Dettaglio riga provvigione agente nelle righe fattura"

#. module: l10n_it_riba_sale_commission
#: model:ir.model,name:l10n_it_riba_sale_commission.model_riba_configuration
msgid "Configuration parameters for Cash Orders"
msgstr "Parametri di configurazione delle ricevute bancarie"

#. module: l10n_it_riba_sale_commission
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_account_invoice_line_agent__display_name
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_account_move__display_name
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_riba_configuration__display_name
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_sale_commission_make_settle__display_name
msgid "Display Name"
msgstr "Nome visualizzato"

#. module: l10n_it_riba_sale_commission
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_account_invoice_line_agent__id
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_account_move__id
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_riba_configuration__id
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_sale_commission_make_settle__id
msgid "ID"
msgstr "ID"

#. module: l10n_it_riba_sale_commission
#: model:ir.model,name:l10n_it_riba_sale_commission.model_account_move
msgid "Journal Entry"
msgstr "Registrazione contabile"

#. module: l10n_it_riba_sale_commission
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_account_invoice_line_agent____last_update
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_account_move____last_update
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_riba_configuration____last_update
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_sale_commission_make_settle____last_update
msgid "Last Modified on"
msgstr "Ultima modifica il"

#. module: l10n_it_riba_sale_commission
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_riba_configuration__safety_days
msgid "Safety days for commission"
msgstr "Giorni di sicurezza per provvigioni"

#. module: l10n_it_riba_sale_commission
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_account_bank_statement_line__no_commission
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_account_move__no_commission
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_account_payment__no_commission
msgid "Without commissions"
msgstr "Senza provvigioni"

#. module: l10n_it_riba_sale_commission
#: model:ir.model,name:l10n_it_riba_sale_commission.model_sale_commission_make_settle
msgid "Wizard for settling commissions in invoices"
msgstr "Procedura per regolare le provvigioni nelle fatture"

#~ msgid "Safety days"
#~ msgstr "Giorni di sicurezza"

#~ msgid "Created Settlements"
#~ msgstr "Liquidazioni create"

#~ msgid "Invoice"
#~ msgstr "Fattura"
70 changes: 70 additions & 0 deletions l10n_it_riba_sale_commission/i18n/l10n_it_riba_sale_commission.pot
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * l10n_it_riba_sale_commission
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 14.0\n"
"Report-Msgid-Bugs-To: \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: l10n_it_riba_sale_commission
#: model:ir.model,name:l10n_it_riba_sale_commission.model_account_invoice_line_agent
msgid "Agent detail of commission line in invoice lines"
msgstr ""

#. module: l10n_it_riba_sale_commission
#: model:ir.model,name:l10n_it_riba_sale_commission.model_riba_configuration
msgid "Configuration parameters for Cash Orders"
msgstr ""

#. module: l10n_it_riba_sale_commission
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_account_invoice_line_agent__display_name
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_account_move__display_name
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_riba_configuration__display_name
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_sale_commission_make_settle__display_name
msgid "Display Name"
msgstr ""

#. module: l10n_it_riba_sale_commission
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_account_invoice_line_agent__id
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_account_move__id
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_riba_configuration__id
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_sale_commission_make_settle__id
msgid "ID"
msgstr ""

#. module: l10n_it_riba_sale_commission
#: model:ir.model,name:l10n_it_riba_sale_commission.model_account_move
msgid "Journal Entry"
msgstr ""

#. module: l10n_it_riba_sale_commission
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_account_invoice_line_agent____last_update
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_account_move____last_update
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_riba_configuration____last_update
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_sale_commission_make_settle____last_update
msgid "Last Modified on"
msgstr ""

#. module: l10n_it_riba_sale_commission
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_riba_configuration__safety_days
msgid "Safety days for commission"
msgstr ""

#. module: l10n_it_riba_sale_commission
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_account_bank_statement_line__no_commission
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_account_move__no_commission
#: model:ir.model.fields,field_description:l10n_it_riba_sale_commission.field_account_payment__no_commission
msgid "Without commissions"
msgstr ""

#. module: l10n_it_riba_sale_commission
#: model:ir.model,name:l10n_it_riba_sale_commission.model_sale_commission_make_settle
msgid "Wizard for settling commissions in invoices"
msgstr ""
3 changes: 3 additions & 0 deletions l10n_it_riba_sale_commission/models/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
from . import account_move
from . import riba_config
64 changes: 64 additions & 0 deletions l10n_it_riba_sale_commission/models/account_move.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).

from datetime import date, timedelta

from odoo import fields, models


class AccountMove(models.Model):
_inherit = "account.move"

no_commission = fields.Boolean(string="Without commissions")

def _get_reconciled_invoices_partials(self):
"""
If a partial payment is an sbf Riba payment and the safety days haven't
passed yet, I exclude the payment from the partials list where commissions
will be generated.
"""
(
invoice_partials,
exchange_diff_moves,
) = super()._get_reconciled_invoices_partials()
to_remove = []
for (
partial,
amount,
counterpart_line,
) in invoice_partials:
riba_mv_line = self.env["riba.slip.move.line"].search(
[("move_line_id", "=", partial.debit_move_id.id)]
)
if riba_mv_line:
riba_type = riba_mv_line.riba_line_id.type
if (
riba_mv_line.riba_line_id.due_date
+ timedelta(days=riba_mv_line.riba_line_id.config_id.safety_days)
> date.today()
) and riba_type == "sbf":
to_remove.append((partial, amount, counterpart_line))
return [
item for item in invoice_partials if item not in to_remove
], exchange_diff_moves


class AccountInvoiceLineAgent(models.Model):
_inherit = "account.invoice.line.agent"

def _skip_future_payments(self, date_payment_to):
if self.invoice_id.is_riba_payment:
dates = [

Check warning on line 50 in l10n_it_riba_sale_commission/models/account_move.py

View check run for this annotation

Codecov / codecov/patch

l10n_it_riba_sale_commission/models/account_move.py#L50

Added line #L50 was not covered by tests
line.date_maturity
+ timedelta(
max(
line.mapped(
"distinta_line_ids.riba_line_id.config_id.safety_days"
),
default=0,
)
)
for line in self.invoice_id.line_ids.filtered(lambda r: r.date_maturity)
]
if dates:
return date_payment_to < max(dates)
return super()._skip_future_payments(date_payment_to)

Check warning on line 64 in l10n_it_riba_sale_commission/models/account_move.py

View check run for this annotation

Codecov / codecov/patch

l10n_it_riba_sale_commission/models/account_move.py#L63-L64

Added lines #L63 - L64 were not covered by tests
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Non trovo questo metodo in super, puoi controllare?
Ho fatto qualche ricerca ed era stato introdotto in 14.0 da OCA/commission#441 ma in 16.0 non lo vedo, e non vedo nemmeno delle PR per portare OCA/commission#441 in 16.0.

Copy link
Contributor Author

@matteonext matteonext Dec 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Grazie della review, si, effettivamente il metodo non è presente nella 16. Mi consigli di proporre una pr per portare la pr in account_commission oppure rimuovo il metodo?
@francesco-ooops cosa ne pensi?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Grazie della review, si, effettivamente il metodo non è presente nella 16. Mi consigli di proporre una pr per portare la pr in account_commission oppure rimuovo il metodo?

Da quello che sto capendo di questi moduli questo override è un punto cardine del funzionamento di questo modulo, e se non esiste in super probabilmente vuole anche dire che non viene chiamato quando dovrebbe: secondo me sarebbe da portare OCA/commission#441 a 16.0.

Mi stupisce anche un po' che i test passino senza che questo metodo sia in super, quindi magari mi sto perdendo qualche pezzo.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ho proposto questa pr: OCA/commission#588

7 changes: 7 additions & 0 deletions l10n_it_riba_sale_commission/models/riba_config.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
from odoo import fields, models


class RibaConfiguration(models.Model):
_inherit = "riba.configuration"

safety_days = fields.Integer("Safety days for commission", default=5)
3 changes: 3 additions & 0 deletions l10n_it_riba_sale_commission/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["whool"]
build-backend = "whool.buildapi"
1 change: 1 addition & 0 deletions l10n_it_riba_sale_commission/readme/CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Nextev Srl \<<[email protected]>\>
Loading
Loading