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

[17.0][MIG] sale_triple_discount #3406

Open
wants to merge 44 commits into
base: 17.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
914c411
[ADD] sale_triple_discount
tafaRU Mar 27, 2017
beb7025
[MIG] sale_triple_discount: Migration to 10.0
chienandalu Sep 7, 2017
77a4cae
Translated using Weblate (Nederlands (nl_NL))
thomaspot Jun 21, 2018
58b4fc7
Translated using Weblate (Dutch (nl_NL))
thomaspot Jun 21, 2018
d327702
[FIX] sale_triple_discount: Correctly compute taxes with round_global…
SimoRubi Dec 19, 2018
b7ba171
[FIX] sale_triple_discount: Store values in cache for recomputation c…
SimoRubi Dec 21, 2018
b36dfe7
sale_triple_discount: Fix tax total on report: include the discount2/…
jbaudoux Nov 21, 2018
c4c40cb
[IMP] 10.0 sale_triple_discount: rework discount computation
mpanarin Jul 13, 2018
c6cb619
Play onchange after invoice creation to ensure discounts are applied
grindtildeath Jul 4, 2019
079bd02
Fix groups on sale.order view
grindtildeath Jul 4, 2019
f484df8
[MIG] sale_triple_discount: Migration to 12.0
tafaRU Nov 22, 2019
8fbb58b
[IMP] sale_triple_discount: black, isort, prettier
ps-tubtim May 8, 2020
b74e7fe
[MIG] sale_triple_discount: Migration to 13.0
ps-tubtim Jun 22, 2020
c95dede
[IMP] sale_triple_discount: black, isort, prettier
ferran-S73 Sep 29, 2021
809f866
[14.0][MIG] sale_triple_discount: Migration to V14
ferran-S73 Sep 29, 2021
d1336da
[14.0][IMP] sale_triple_discount: add disc. fields in sale report templ.
ferran-S73 Feb 23, 2022
29416c0
[14.0] sale_triple_discount: sale_order_line_discount_validation compat.
ferran-S73 Mar 28, 2022
d3f2a46
Translated using Weblate (Italian)
francesco-ooops Apr 8, 2022
d812bc2
Translated using Weblate (French)
klodr Sep 15, 2022
be1ac2d
[IMP] sale_triple_discount: black, isort, prettier
manuelregidor Oct 19, 2022
dccd773
[MIG]sale_triple_discount: Migration to 15.0
manuelregidor Oct 19, 2022
98aa4dc
sale_triple_discount 15.0.1.0.1
OCA-git-bot Oct 25, 2022
a9e0e30
[16.0][MIG] - sale_triple_discount
sbejaoui Dec 28, 2022
a8e5275
[UPD] Update sale_triple_discount.pot
Jan 26, 2023
29cf8b6
[UPD] README.rst
OCA-git-bot Jan 26, 2023
0b00c1f
sale_triple_discount 16.0.1.0.1
OCA-git-bot Jan 26, 2023
5da445e
Update translation files
weblate Jan 26, 2023
a8b5389
Added translation using Weblate (Spanish (Mexico))
alan196 Feb 14, 2023
a328f23
Translated using Weblate (Spanish (Mexico))
alan196 Feb 14, 2023
7391bbf
Translated using Weblate (Italian)
GiuTav Jun 14, 2023
ab2a2e4
Translated using Weblate (Spanish)
Ivorra78 Jul 25, 2023
1577b27
[UPD] README.rst
OCA-git-bot Sep 3, 2023
d821d00
Translated using Weblate (Italian)
mymage Dec 1, 2023
8b36e56
[IMP] sale_triple_discount: improve module extensibility
renda-dev Mar 26, 2024
f49de7f
Translated using Weblate (German)
jappi00 Apr 10, 2024
4d7afd2
[BOT] post-merge updates
OCA-git-bot May 18, 2024
66b791a
Translated using Weblate (Portuguese (Brazil))
May 29, 2024
ea7b8dd
[FIX] sale_triple_discount: Remove call to deprecated
lmignon Sep 25, 2024
d1f1705
[BOT] post-merge updates
OCA-git-bot Sep 25, 2024
90a6565
[IMP] sale_triple_discount: Improves perfs and consistency
lmignon Sep 26, 2024
ff4b4b7
[BOT] post-merge updates
OCA-git-bot Oct 16, 2024
2ad81ad
[IMP] sale_triple_discount: pre-commit auto fixes
dalonsod Nov 12, 2024
e83f3be
[MIG] sale_triple_discount: Migration to 17.0
dalonsod Nov 12, 2024
02c0ad4
[DON'T MERGE] test-requirements.txt
dalonsod Nov 12, 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
40 changes: 21 additions & 19 deletions sale_order_general_discount/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,14 @@ Sale Order General Discount

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

This module allows to set a general discount in a sales order. This general
discount is set to each line order in the standard `discount` field.
This module allows to set a general discount in a sales order. This
general discount is set to each line order in the standard discount
field.

You can configure:
* a default general discount on customers
* On each product define if general discount is applied

- a default general discount on customers
- On each product define if general discount is applied

**Table of contents**

Expand All @@ -43,19 +45,19 @@ You can configure:
Installation
============

You need to install sale_management module for accessing the needed menus.
You need to install sale_management module for accessing the needed
menus.

Usage
=====

To use this module, you need to:

#. Create a sale order and set a discount,
this discount will be set in all lines.
#. You can set a discount in a partner.
#. On product you can define if you
apply general discount on sale order line
linked to that product
1. Create a sale order and set a discount, this discount will be set in
all lines.
2. You can set a discount in a partner.
3. On product you can define if you apply general discount on sale order
line linked to that product

Bug Tracker
===========
Expand All @@ -71,23 +73,23 @@ Credits
=======

Authors
~~~~~~~
-------

* Tecnativa

Contributors
~~~~~~~~~~~~
------------

* `Tecnativa <https://www.tecnativa.com>`_:
- `Tecnativa <https://www.tecnativa.com>`__:

* Sergio Teruel <[email protected]>
* Stefan Ungureanu <[email protected]>
- Sergio Teruel <[email protected]>
- Stefan Ungureanu <[email protected]>

* Raf Ven <[email protected]>
* Sudhir Arya <[email protected]>
- Raf Ven <[email protected]>
- Sudhir Arya <[email protected]>

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

This module is maintained by the OCA.

Expand Down
5 changes: 5 additions & 0 deletions sale_order_general_discount/readme/CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- [Tecnativa](https://www.tecnativa.com):
- Sergio Teruel \<<[email protected]>\>
- Stefan Ungureanu \<<[email protected]>\>
- Raf Ven \<<[email protected]>\>
- Sudhir Arya \<<[email protected]>\>
7 changes: 0 additions & 7 deletions sale_order_general_discount/readme/CONTRIBUTORS.rst

This file was deleted.

7 changes: 7 additions & 0 deletions sale_order_general_discount/readme/DESCRIPTION.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
This module allows to set a general discount in a sales order. This
general discount is set to each line order in the standard discount
field.

You can configure:
- a default general discount on customers
- On each product define if general discount is applied
6 changes: 0 additions & 6 deletions sale_order_general_discount/readme/DESCRIPTION.rst

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
You need to install sale_management module for accessing the needed menus.
You need to install sale_management module for accessing the needed
menus.
7 changes: 7 additions & 0 deletions sale_order_general_discount/readme/USAGE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
To use this module, you need to:

1. Create a sale order and set a discount, this discount will be set in
all lines.
2. You can set a discount in a partner.
3. On product you can define if you apply general discount on sale
order line linked to that product
8 changes: 0 additions & 8 deletions sale_order_general_discount/readme/USAGE.rst

This file was deleted.

35 changes: 15 additions & 20 deletions sale_order_general_discount/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@

/*
:Author: David Goodger ([email protected])
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
:Copyright: This stylesheet has been placed in the public domain.

Default cascading style sheet for the HTML output of Docutils.
Despite the name, some widely supported CSS2 features are used.

See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet.
Expand Down Expand Up @@ -275,7 +274,7 @@
margin-left: 2em ;
margin-right: 2em }

pre.code .ln { color: gray; } /* line numbers */
pre.code .ln { color: grey; } /* line numbers */
pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
Expand All @@ -301,7 +300,7 @@
span.pre {
white-space: pre }

span.problematic, pre.problematic {
span.problematic {
color: red }

span.section-subtitle {
Expand Down Expand Up @@ -370,16 +369,14 @@ <h1 class="title">Sale Order General Discount</h1>
!! source digest: sha256:a4eeadfa3e2fc4ad9f54244dc002a32d12938c91207c4f729001730ca727a156
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.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/sale-workflow/tree/17.0/sale_order_general_discount"><img alt="OCA/sale-workflow" src="https://img.shields.io/badge/github-OCA%2Fsale--workflow-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/sale-workflow-17-0/sale-workflow-17-0-sale_order_general_discount"><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/sale-workflow&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 allows to set a general discount in a sales order. This general
discount is set to each line order in the standard <cite>discount</cite> field.</p>
<dl class="docutils">
<dt>You can configure:</dt>
<dd><ul class="first last simple">
<p>This module allows to set a general discount in a sales order. This
general discount is set to each line order in the standard discount
field.</p>
<p>You can configure:</p>
<ul class="simple">
<li>a default general discount on customers</li>
<li>On each product define if general discount is applied</li>
</ul>
</dd>
</dl>
<p><strong>Table of contents</strong></p>
<div class="contents local topic" id="contents">
<ul class="simple">
Expand All @@ -396,18 +393,18 @@ <h1 class="title">Sale Order General Discount</h1>
</div>
<div class="section" id="installation">
<h1><a class="toc-backref" href="#toc-entry-1">Installation</a></h1>
<p>You need to install sale_management module for accessing the needed menus.</p>
<p>You need to install sale_management module for accessing the needed
menus.</p>
</div>
<div class="section" id="usage">
<h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
<p>To use this module, you need to:</p>
<ol class="arabic simple">
<li>Create a sale order and set a discount,
this discount will be set in all lines.</li>
<li>Create a sale order and set a discount, this discount will be set in
all lines.</li>
<li>You can set a discount in a partner.</li>
<li>On product you can define if you
apply general discount on sale order line
linked to that product</li>
<li>On product you can define if you apply general discount on sale order
line linked to that product</li>
</ol>
</div>
<div class="section" id="bug-tracker">
Expand Down Expand Up @@ -441,9 +438,7 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-7">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>
<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>
Expand Down
128 changes: 128 additions & 0 deletions sale_triple_discount/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
====================
Sale Triple Discount
====================

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

.. |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%2Fsale--workflow-lightgray.png?logo=github
:target: https://github.com/OCA/sale-workflow/tree/17.0/sale_triple_discount
:alt: OCA/sale-workflow
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/sale-workflow-17-0/sale-workflow-17-0-sale_triple_discount
: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/sale-workflow&target_branch=17.0
:alt: Try me on Runboat

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

This module allows to have three discounts on every sale order line.

**Table of contents**

.. contents::
:local:

Configuration
=============

To configure this module, you need to:

- set **Discount on lines** group to be able to see discounts on the
lines

Usage
=====

Create a new sale order and add discounts in any of the three discount
fields given.

For multiplicative discounts they go in order of precedence so discount
2 will be calculated over discount 1 and discount 3 over the result of
discount 2. For example, let's divide by two on every discount:

Unit price: 600.00 ->

- Disc. 1 = 50% -> Amount = 300.00
- Disc. 2 = 50% -> Amount = 150.00
- Disc. 3 = 50% -> Amount = 75.00

For additive discounts they will be summed first and then applied. For
example, let's have a three 20% discounts:

Unit price: 600.00 ->

- Disc. 1, 2, 3 = 20% + 20% + 20% -> 60%
- Disc. final = 60% -> Amount = 240.00

You can also use negative values to make a charge instead of a discount:

Unit price: 600.00 ->

- Disc. 1 = 50% -> Amount = 300.00
- Disc. 2 = -5% -> Amount = 315.00

Module allows defining additional discount fields and applying them with
other by adding them to the \_discount_fields method.

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

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

* ADHOC SA
* Agile Business Group
* Tecnativa

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

- Nicolas Mac Rouillon <@nicomacr>
- Juan José Scarafía <[email protected]>
- Alex Comba <[email protected]>
- David Vidal <[email protected]>
- Simone Rubino <[email protected]>
- Jacques-Etienne Baudoux (BCIM sprl) <[email protected]>
- Pimolnat Suntian <[email protected]>
- Denis Leemann <[email protected]>
- Manuel Regidor <[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.

This module is part of the `OCA/sale-workflow <https://github.com/OCA/sale-workflow/tree/17.0/sale_triple_discount>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
1 change: 1 addition & 0 deletions sale_triple_discount/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from . import models
19 changes: 19 additions & 0 deletions sale_triple_discount/__manifest__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Copyright 2015 ADHOC SA (http://www.adhoc.com.ar)
# Copyright 2017 - 2019 Alex Comba - Agile Business Group
# Copyright 2017 Tecnativa - David Vidal
# Copyright 2018 Jacques-Etienne Baudoux (BCIM sprl) <[email protected]>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

{
"name": "Sale Triple Discount",
"version": "17.0.1.0.0",
"category": "Sales",
"author": "ADHOC SA, Agile Business Group, Tecnativa, "
"Odoo Community Association (OCA)",
"website": "https://github.com/OCA/sale-workflow",
"license": "AGPL-3",
"summary": "Manage triple discount on sale order lines",
"depends": ["sale", "account_invoice_triple_discount"],
"data": ["views/sale_order_report.xml", "views/sale_order_view.xml"],
"installable": True,
}
Loading
Loading