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

[WIP][17.0] agreement rebate #34

Closed
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f943bd9
[ADD] agreement_rebate: New module to manage agreement rebate sales
sergio-teruel May 13, 2020
bcc878c
[IMP] agreement_rebate: Add active fields in settlements
carlosdauden Mar 7, 2022
fb05337
[IMP] Add partner_id as deafult _settlement_line_break_fields
sergio-teruel Mar 9, 2022
38c2d7f
[IMP] Add partner_id to settlement lines tree view
sergio-teruel Mar 9, 2022
6e66d07
[IMP] agreement_rebate: Set partner_id to settlement lines
sergio-teruel Mar 9, 2022
a7ad3fb
[IMP] agreement_rebate: Improvements
carlosdauden Apr 21, 2022
c3b292f
[UPD] Update agreement_rebate.pot
Jun 18, 2022
3c19cca
agreement_rebate 13.0.1.0.1
OCA-git-bot Jun 18, 2022
ed20217
[IMP] agreement_rebate: black, isort
sergio-teruel Nov 1, 2022
b7204d6
[MIG] agreement_rebate: Migration to v15.0
sergio-teruel Nov 1, 2022
0a1a479
[UPD] Update agreement_rebate.pot
Dec 16, 2022
7803caf
[UPD] README.rst
OCA-git-bot Dec 16, 2022
592ede6
Update translation files
weblate Dec 16, 2022
af96db4
[IMP] agreement: Change menus structure to make it easy to adapt
Jan 26, 2023
b002612
[UPD] Update agreement_rebate.pot
Jan 26, 2023
a225bb3
agreement_rebate 15.0.1.1.0
OCA-git-bot Jan 26, 2023
ac8f227
Update translation files
weblate Jan 26, 2023
49f5f91
[MIG] agreement_rebate: Migration to 16.0
ao-landoo Jul 18, 2023
5bd29b3
[UPD] Update agreement_rebate.pot
Sep 17, 2023
9f94cf6
oca-github-bot post-merge updates
OCA-git-bot Sep 17, 2023
8c9b340
Update translation files
weblate Sep 20, 2023
abad766
Translated using Weblate (Spanish)
Ivorra78 Sep 21, 2023
dbf2fb3
[FIX] aggrement_rebate: The type of movement is defined in the field …
pilarvargas-tecnativa Jan 31, 2024
cf736af
[BOT] post-merge updates
OCA-git-bot Jan 31, 2024
7fbd61b
[IMP] : pre-commit auto fixes
chandni-serpentcs Feb 20, 2024
b0a311b
[MIG]agreement_rebate: Migrated module to V17
chandni-serpentcs Mar 19, 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
Prev Previous commit
Next Next commit
[IMP] : pre-commit auto fixes
  • Loading branch information
chandni-serpentcs committed Feb 20, 2024
commit 7fbd61bceb0b340d5771a4a12335ac2bc04b0e61
92 changes: 45 additions & 47 deletions agreement_rebate/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ Agreement Rebate
: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/16.0/agreement_rebate
:target: https://github.com/OCA/agreement/tree/17.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-16-0/agreement-16-0-agreement_rebate
:target: https://translation.odoo-community.org/projects/agreement-17-0/agreement-17-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=16.0
:target: https://runboat.odoo-community.org/builds?repo=OCA/agreement&target_branch=17.0
:alt: Try me on Runboat

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

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

**Table of contents**

Expand All @@ -41,84 +41,82 @@ Usage

To use this module you need to:

#. Go to a *Agreements > agreement*.
#. Create an agreement of type *Rebate agreement for sale*.
#. Set a rappel type.
1. Go to a *Agreements > agreement*.

Basic global rappel discount
2. Create an agreement of type *Rebate agreement for sale*.

.. image:: https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/agreement_discount_global.png
:width: 80 %
:align: center
3. Set a rappel type.

Basic rappel discount by line items
Basic global rappel discount

.. image:: https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/agreement_discount_line.png
:width: 80 %
:align: center
|image|

Section rappel discount rule match
Basic rappel discount by line items

.. image:: https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/agreement_discount_section_rule_match.png
:width: 80 %
:align: center
|image1|

Calculate the discount in each amount section
Section rappel discount rule match

.. image:: https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/agreement_discount_section.png
:width: 80 %
:align: center
|image2|

#. Create any rebate lines to apply this agreement.
Calculate the discount in each amount section

Add a product template filter to apply this agreement
|image3|

.. image:: https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/agreement_rebate_lines_filter.png
:width: 80 %
:align: center
4. Create any rebate lines to apply this agreement.

#. Do some invoices of products included in any rebate agreement
#. Create rebate settlements from *Agreements > Settlements > Create Settlements*
wizard
Add a product template filter to apply this agreement

.. image:: https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/create_settlements_wizard.png
:width: 80 %
:align: center
|image4|

#. Create rappel invoices from *Agreements > Settlements > Create Invoices* wizard
5. Do some invoices of products included in any rebate agreement

.. image:: https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/create_settlement_invoices.png
:width: 80 %
:align: center
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/17.0/agreement_rebate/static/img/agreement_discount_global.png
.. |image1| image:: https://raw.githubusercontent.com/OCA/agreement/17.0/agreement_rebate/static/img/agreement_discount_line.png
.. |image2| image:: https://raw.githubusercontent.com/OCA/agreement/17.0/agreement_rebate/static/img/agreement_discount_section_rule_match.png
.. |image3| image:: https://raw.githubusercontent.com/OCA/agreement/17.0/agreement_rebate/static/img/agreement_discount_section.png
.. |image4| image:: https://raw.githubusercontent.com/OCA/agreement/17.0/agreement_rebate/static/img/agreement_rebate_lines_filter.png
.. |image5| image:: https://raw.githubusercontent.com/OCA/agreement/17.0/agreement_rebate/static/img/create_settlements_wizard.png
.. |image6| image:: https://raw.githubusercontent.com/OCA/agreement/17.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:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
`feedback <https://github.com/OCA/agreement/issues/new?body=module:%20agreement_rebate%0Aversion:%2017.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>`_:
- `Tecnativa <https://www.tecnativa.com>`__:

* Carlos Dauden <[email protected]>
* Sergio Teruel <[email protected]>
- Carlos Dauden <[email protected]>
- Sergio Teruel <[email protected]>

Maintainers
~~~~~~~~~~~
-----------

This module is maintained by the OCA.

Expand All @@ -130,6 +128,6 @@ 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/16.0/agreement_rebate>`_ project on GitHub.
This module is part of the `OCA/agreement <https://github.com/OCA/agreement/tree/17.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/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["whool"]
build-backend = "whool.buildapi"
4 changes: 4 additions & 0 deletions agreement_rebate/readme/CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- [Tecnativa](https://www.tecnativa.com):

> - Carlos Dauden \<<[email protected]>\>
> - Sergio Teruel \<<[email protected]>\>
4 changes: 0 additions & 4 deletions agreement_rebate/readme/CONTRIBUTORS.rst

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
This module extends the functionality of agreement module to allow define
rebate conditions.
This module extends the functionality of agreement module to allow
define rebate conditions.
41 changes: 41 additions & 0 deletions agreement_rebate/readme/USAGE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
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](../static/img/agreement_discount_global.png)
>
> Basic rappel discount by line items
>
> ![image](../static/img/agreement_discount_line.png)
>
> Section rappel discount rule match
>
> ![image](../static/img/agreement_discount_section_rule_match.png)
>
> Calculate the discount in each amount section
>
> ![image](../static/img/agreement_discount_section.png)

4. Create any rebate lines to apply this agreement.

> Add a product template filter to apply this agreement
>
> ![image](../static/img/agreement_rebate_lines_filter.png)

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

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

> ![image](../static/img/create_settlements_wizard.png)

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

> ![image](../static/img/create_settlement_invoices.png)
51 changes: 0 additions & 51 deletions agreement_rebate/readme/USAGE.rst

This file was deleted.

32 changes: 17 additions & 15 deletions agreement_rebate/static/description/index.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!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>
Expand Down Expand Up @@ -368,9 +369,9 @@ <h1 class="title">Agreement Rebate</h1>
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:5b7242b1d8b9588b1724ec1d569cbd0ea5999c7ba01c2223a0efcc0c6a286fa4
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/agreement/tree/16.0/agreement_rebate"><img alt="OCA/agreement" src="https://img.shields.io/badge/github-OCA%2Fagreement-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/agreement-16-0/agreement-16-0-agreement_rebate"><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/agreement&amp;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 extends the functionality of agreement module to allow define
rebate conditions.</p>
<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/agreement/tree/17.0/agreement_rebate"><img alt="OCA/agreement" src="https://img.shields.io/badge/github-OCA%2Fagreement-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/agreement-17-0/agreement-17-0-agreement_rebate"><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/agreement&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module extends the functionality of agreement module to allow
define rebate conditions.</p>
<p><strong>Table of contents</strong></p>
<div class="contents local topic" id="contents">
<ul class="simple">
Expand All @@ -395,32 +396,33 @@ <h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
<li><p class="first">Set a rappel type.</p>
<blockquote>
<p>Basic global rappel discount</p>
<img alt="https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/agreement_discount_global.png" class="align-center" src="https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/agreement_discount_global.png" style="width: 80%;" />
<p><img alt="image" src="https://raw.githubusercontent.com/OCA/agreement/17.0/agreement_rebate/static/img/agreement_discount_global.png" /></p>
<p>Basic rappel discount by line items</p>
<img alt="https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/agreement_discount_line.png" class="align-center" src="https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/agreement_discount_line.png" style="width: 80%;" />
<p><img alt="image1" src="https://raw.githubusercontent.com/OCA/agreement/17.0/agreement_rebate/static/img/agreement_discount_line.png" /></p>
<p>Section rappel discount rule match</p>
<img alt="https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/agreement_discount_section_rule_match.png" class="align-center" src="https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/agreement_discount_section_rule_match.png" style="width: 80%;" />
<p><img alt="image2" src="https://raw.githubusercontent.com/OCA/agreement/17.0/agreement_rebate/static/img/agreement_discount_section_rule_match.png" /></p>
<p>Calculate the discount in each amount section</p>
<img alt="https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/agreement_discount_section.png" class="align-center" src="https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/agreement_discount_section.png" style="width: 80%;" />
<p><img alt="image3" src="https://raw.githubusercontent.com/OCA/agreement/17.0/agreement_rebate/static/img/agreement_discount_section.png" /></p>
</blockquote>
</li>
<li><p class="first">Create any rebate lines to apply this agreement.</p>
<blockquote>
<p>Add a product template filter to apply this agreement</p>
<img alt="https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/agreement_rebate_lines_filter.png" class="align-center" src="https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/agreement_rebate_lines_filter.png" style="width: 80%;" />
<p><img alt="image4" src="https://raw.githubusercontent.com/OCA/agreement/17.0/agreement_rebate/static/img/agreement_rebate_lines_filter.png" /></p>
</blockquote>
</li>
<li><p class="first">Do some invoices of products included in any rebate agreement</p>
</li>
<li><p class="first">Create rebate settlements from <em>Agreements &gt; Settlements &gt; Create Settlements</em>
wizard</p>
<li><p class="first">Create rebate settlements from <em>Agreements &gt; Settlements &gt; Create
Settlements</em> wizard</p>
<blockquote>
<img alt="https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/create_settlements_wizard.png" class="align-center" src="https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/create_settlements_wizard.png" style="width: 80%;" />
<p><img alt="image5" src="https://raw.githubusercontent.com/OCA/agreement/17.0/agreement_rebate/static/img/create_settlements_wizard.png" /></p>
</blockquote>
</li>
<li><p class="first">Create rappel invoices from <em>Agreements &gt; Settlements &gt; Create Invoices</em> wizard</p>
<li><p class="first">Create rappel invoices from <em>Agreements &gt; Settlements &gt; Create
Invoices</em> wizard</p>
<blockquote>
<img alt="https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/create_settlement_invoices.png" class="align-center" src="https://raw.githubusercontent.com/OCA/agreement/16.0/agreement_rebate/static/img/create_settlement_invoices.png" style="width: 80%;" />
<p><img alt="image6" src="https://raw.githubusercontent.com/OCA/agreement/17.0/agreement_rebate/static/img/create_settlement_invoices.png" /></p>
</blockquote>
</li>
</ol>
Expand All @@ -430,7 +432,7 @@ <h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/agreement/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/agreement/issues/new?body=module:%20agreement_rebate%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<a class="reference external" href="https://github.com/OCA/agreement/issues/new?body=module:%20agreement_rebate%0Aversion:%2017.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">
Expand Down Expand Up @@ -461,7 +463,7 @@ <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
<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>This module is part of the <a class="reference external" href="https://github.com/OCA/agreement/tree/16.0/agreement_rebate">OCA/agreement</a> project on GitHub.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/agreement/tree/17.0/agreement_rebate">OCA/agreement</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>
Expand Down
Loading
Loading