Skip to content

Commit

Permalink
Merge pull request #65 from OCA/18.0
Browse files Browse the repository at this point in the history
Syncing from upstream OCA/agreement (18.0)
  • Loading branch information
bt-admin authored Feb 7, 2025
2 parents 7ec0d91 + f0a0757 commit c562913
Show file tree
Hide file tree
Showing 55 changed files with 5,032 additions and 17 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Available addons
addon | version | maintainers | summary
--- | --- | --- | ---
[agreement](agreement/) | 18.0.1.0.0 | [![ygol](https://github.com/ygol.png?size=30px)](https://github.com/ygol) [![alexis-via](https://github.com/alexis-via.png?size=30px)](https://github.com/alexis-via) | Adds an agreement object
[agreement_rebate](agreement_rebate/) | 18.0.1.0.0 | | Rebate in agreements

[//]: # (end addons)

Expand Down
10 changes: 10 additions & 0 deletions agreement/i18n/agreement.pot
Original file line number Diff line number Diff line change
Expand Up @@ -373,3 +373,13 @@ msgstr ""
#: model:res.groups,name:agreement.group_use_agreement_type
msgid "Use agreement type"
msgstr ""

#. module: agreement
#: model:ir.model.fields,field_description:agreement.field_agreement__website_message_ids
msgid "Website Messages"
msgstr ""

#. module: agreement
#: model:ir.model.fields,help:agreement.field_agreement__website_message_ids
msgid "Website communication history"
msgstr ""
12 changes: 8 additions & 4 deletions agreement/i18n/ca.po
Original file line number Diff line number Diff line change
Expand Up @@ -383,11 +383,15 @@ msgstr "Utilitzeu la plantilla d'acord"
msgid "Use agreement type"
msgstr "Utilitzeu el tipus d'acord"

#~ msgid "Website Messages"
#~ msgstr "Missatges del lloc web"
#. module: agreement
#: model:ir.model.fields,field_description:agreement.field_agreement__website_message_ids
msgid "Website Messages"
msgstr "Missatges del lloc web"

#~ msgid "Website communication history"
#~ msgstr "Historial de comunicacions del lloc web"
#. module: agreement
#: model:ir.model.fields,help:agreement.field_agreement__website_message_ids
msgid "Website communication history"
msgstr "Historial de comunicacions del lloc web"

#, python-format
#~ msgid "%s (copy)"
Expand Down
10 changes: 10 additions & 0 deletions agreement/i18n/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,16 @@ msgstr "Vereinbarungsvorlage verwenden"
msgid "Use agreement type"
msgstr "Verwenden Sie den Vereinbarungstyp"

#. module: agreement
#: model:ir.model.fields,field_description:agreement.field_agreement__website_message_ids
msgid "Website Messages"
msgstr ""

#. module: agreement
#: model:ir.model.fields,help:agreement.field_agreement__website_message_ids
msgid "Website communication history"
msgstr ""

#~ msgid "ID used for internal contract tracking."
#~ msgstr "ID, die zur internen Vertragsverfolgung verwendet wird."

Expand Down
12 changes: 8 additions & 4 deletions agreement/i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -384,11 +384,15 @@ msgstr "Usar plantilla de acuerdo"
msgid "Use agreement type"
msgstr "Usar tipo de acuerdo"

#~ msgid "Website Messages"
#~ msgstr "mensajes de la página web"
#. module: agreement
#: model:ir.model.fields,field_description:agreement.field_agreement__website_message_ids
msgid "Website Messages"
msgstr "mensajes de la página web"

#~ msgid "Website communication history"
#~ msgstr "Historial de la comunicación en la página web"
#. module: agreement
#: model:ir.model.fields,help:agreement.field_agreement__website_message_ids
msgid "Website communication history"
msgstr "Historial de la comunicación en la página web"

#, python-format
#~ msgid "%s (copy)"
Expand Down
12 changes: 8 additions & 4 deletions agreement/i18n/es_AR.po
Original file line number Diff line number Diff line change
Expand Up @@ -383,11 +383,15 @@ msgstr "Usar una plantilla de acuerdo"
msgid "Use agreement type"
msgstr "Usar tipo de acuerdo"

#~ msgid "Website Messages"
#~ msgstr "Mensajes del Sitio Web"
#. module: agreement
#: model:ir.model.fields,field_description:agreement.field_agreement__website_message_ids
msgid "Website Messages"
msgstr "Mensajes del Sitio Web"

#~ msgid "Website communication history"
#~ msgstr "Historial de comunicación del sitio web"
#. module: agreement
#: model:ir.model.fields,help:agreement.field_agreement__website_message_ids
msgid "Website communication history"
msgstr "Historial de comunicación del sitio web"

#, python-format
#~ msgid "%s (copy)"
Expand Down
10 changes: 10 additions & 0 deletions agreement/i18n/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,16 @@ msgstr "Utiliser le modèle d'accord"
msgid "Use agreement type"
msgstr "Utiliser le type d'accord"

#. module: agreement
#: model:ir.model.fields,field_description:agreement.field_agreement__website_message_ids
msgid "Website Messages"
msgstr ""

#. module: agreement
#: model:ir.model.fields,help:agreement.field_agreement__website_message_ids
msgid "Website communication history"
msgstr ""

#, python-format
#~ msgid "%s (copy)"
#~ msgstr "%s (copie)"
Expand Down
10 changes: 10 additions & 0 deletions agreement/i18n/fr_FR.po
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,16 @@ msgstr "Utiliser le modèle d'accord"
msgid "Use agreement type"
msgstr "Utiliser le type d'accord"

#. module: agreement
#: model:ir.model.fields,field_description:agreement.field_agreement__website_message_ids
msgid "Website Messages"
msgstr ""

#. module: agreement
#: model:ir.model.fields,help:agreement.field_agreement__website_message_ids
msgid "Website communication history"
msgstr ""

#, python-format
#~ msgid "%s (copy)"
#~ msgstr "%s (copie)"
Expand Down
10 changes: 10 additions & 0 deletions agreement/i18n/hr.po
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,16 @@ msgstr ""
msgid "Use agreement type"
msgstr ""

#. module: agreement
#: model:ir.model.fields,field_description:agreement.field_agreement__website_message_ids
msgid "Website Messages"
msgstr ""

#. module: agreement
#: model:ir.model.fields,help:agreement.field_agreement__website_message_ids
msgid "Website communication history"
msgstr ""

#~ msgid "ID used for internal contract tracking."
#~ msgstr "ID za interno praćenje sporazuma"

Expand Down
12 changes: 8 additions & 4 deletions agreement/i18n/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -383,11 +383,15 @@ msgstr "Utilizza modello contratto"
msgid "Use agreement type"
msgstr "Usa tipo accordo"

#~ msgid "Website Messages"
#~ msgstr "Messaggi sito web"
#. module: agreement
#: model:ir.model.fields,field_description:agreement.field_agreement__website_message_ids
msgid "Website Messages"
msgstr "Messaggi sito web"

#~ msgid "Website communication history"
#~ msgstr "Cronologia comunicazioni sito web"
#. module: agreement
#: model:ir.model.fields,help:agreement.field_agreement__website_message_ids
msgid "Website communication history"
msgstr "Cronologia comunicazioni sito web"

#, python-format
#~ msgid "%s (copy)"
Expand Down
10 changes: 10 additions & 0 deletions agreement/i18n/nl.po
Original file line number Diff line number Diff line change
Expand Up @@ -376,3 +376,13 @@ msgstr ""
#: model:res.groups,name:agreement.group_use_agreement_type
msgid "Use agreement type"
msgstr ""

#. module: agreement
#: model:ir.model.fields,field_description:agreement.field_agreement__website_message_ids
msgid "Website Messages"
msgstr ""

#. module: agreement
#: model:ir.model.fields,help:agreement.field_agreement__website_message_ids
msgid "Website communication history"
msgstr ""
10 changes: 10 additions & 0 deletions agreement/i18n/pt.po
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,16 @@ msgstr "Utilizar modelo de acordo"
msgid "Use agreement type"
msgstr "Utilizar tipo de acordo"

#. module: agreement
#: model:ir.model.fields,field_description:agreement.field_agreement__website_message_ids
msgid "Website Messages"
msgstr ""

#. module: agreement
#: model:ir.model.fields,help:agreement.field_agreement__website_message_ids
msgid "Website communication history"
msgstr ""

#, python-format
#~ msgid "%s (copy)"
#~ msgstr "%s (cópia)"
Expand Down
10 changes: 10 additions & 0 deletions agreement/i18n/pt_BR.po
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,16 @@ msgstr "Usar modelo de acordo"
msgid "Use agreement type"
msgstr "Usar tipo de acordo"

#. module: agreement
#: model:ir.model.fields,field_description:agreement.field_agreement__website_message_ids
msgid "Website Messages"
msgstr ""

#. module: agreement
#: model:ir.model.fields,help:agreement.field_agreement__website_message_ids
msgid "Website communication history"
msgstr ""

#, python-format
#~ msgid "%s (copy)"
#~ msgstr "%s (copiar)"
Expand Down
10 changes: 10 additions & 0 deletions agreement/i18n/pt_PT.po
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,16 @@ msgstr "Usar o modelo de contrato"
msgid "Use agreement type"
msgstr "Usar o tipo de contrato"

#. module: agreement
#: model:ir.model.fields,field_description:agreement.field_agreement__website_message_ids
msgid "Website Messages"
msgstr ""

#. module: agreement
#: model:ir.model.fields,help:agreement.field_agreement__website_message_ids
msgid "Website communication history"
msgstr ""

#~ msgid "ID used for internal contract tracking."
#~ msgstr "ID usado internamente para acompanhamento do contrato."

Expand Down
10 changes: 10 additions & 0 deletions agreement/i18n/zh_CN.po
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,16 @@ msgstr "使用协议模板"
msgid "Use agreement type"
msgstr "使用协议类型"

#. module: agreement
#: model:ir.model.fields,field_description:agreement.field_agreement__website_message_ids
msgid "Website Messages"
msgstr ""

#. module: agreement
#: model:ir.model.fields,help:agreement.field_agreement__website_message_ids
msgid "Website communication history"
msgstr ""

#~ msgid "ID used for internal contract tracking."
#~ msgstr "用于内部合同跟踪的ID。"

Expand Down
134 changes: 134 additions & 0 deletions agreement_rebate/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
================
Agreement Rebate
================

..
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:efd1674e3f312e2cf3fd2d33d654b2b365273ac839866a7548f58f035409aafe
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |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%2Fagreement-lightgray.png?logo=github
:target: https://github.com/OCA/agreement/tree/18.0/agreement_rebate
:alt: OCA/agreement
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/agreement-18-0/agreement-18-0-agreement_rebate
: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/agreement&target_branch=18.0
:alt: Try me on Runboat

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

This module extends the functionality of agreement module to allow
define rebate conditions.

**Table of contents**

.. contents::
:local:

Usage
=====

To use this module you need to:

1. Go to a *Agreements > agreement*.

2. Create an agreement of type *Rebate agreement for sale*.

3. Set a rappel type.

Basic global rappel discount

|image|

Basic rappel discount by line items

|image1|

Section rappel discount rule match

|image2|

Calculate the discount in each amount section

|image3|

4. Create any rebate lines to apply this agreement.

Add a product template filter to apply this agreement

|image4|

5. Do some invoices of products included in any rebate agreement

6. Create rebate settlements from *Agreements > Settlements > Create
Settlements* wizard

|image5|

7. Create rappel invoices from *Agreements > Settlements > Create
Invoices* wizard

|image6|

.. |image| image:: https://raw.githubusercontent.com/OCA/agreement/18.0/agreement_rebate/static/img/agreement_discount_global.png
.. |image1| image:: https://raw.githubusercontent.com/OCA/agreement/18.0/agreement_rebate/static/img/agreement_discount_line.png
.. |image2| image:: https://raw.githubusercontent.com/OCA/agreement/18.0/agreement_rebate/static/img/agreement_discount_section_rule_match.png
.. |image3| image:: https://raw.githubusercontent.com/OCA/agreement/18.0/agreement_rebate/static/img/agreement_discount_section.png
.. |image4| image:: https://raw.githubusercontent.com/OCA/agreement/18.0/agreement_rebate/static/img/agreement_rebate_lines_filter.png
.. |image5| image:: https://raw.githubusercontent.com/OCA/agreement/18.0/agreement_rebate/static/img/create_settlements_wizard.png
.. |image6| image:: https://raw.githubusercontent.com/OCA/agreement/18.0/agreement_rebate/static/img/create_settlement_invoices.png

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

Bugs are tracked on `GitHub Issues <https://github.com/OCA/agreement/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/agreement/issues/new?body=module:%20agreement_rebate%0Aversion:%2018.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>`__:

- Carlos Dauden
- Sergio Teruel
- Carlos Roca

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.

This module is part of the `OCA/agreement <https://github.com/OCA/agreement/tree/18.0/agreement_rebate>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
3 changes: 3 additions & 0 deletions agreement_rebate/__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 models
from . import wizards
Loading

0 comments on commit c562913

Please sign in to comment.