-
-
Notifications
You must be signed in to change notification settings - Fork 1k
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][ADD] - sale_order_line_cancel #2357
Open
sbejaoui
wants to merge
10
commits into
OCA:16.0
Choose a base branch
from
acsone:16.0-sale_cancel_remaining-sbj
base: 16.0
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
6940f11
[ADD] - sale_order_line_cancel
sbejaoui 0c6c95c
[ADD] sale_order_line_cancel: add authors
sbejaoui c9d2339
[IMP] sale_order_line_cancel: use float_compare
sbejaoui b2fbb08
[IMP] trace sale line cancel
sbejaoui 7416524
[IMP] sale_order_line_cancel: check moves before cancel
sbejaoui b5cd7f0
[IMP] sale_order_line_cancel: Improve cancel process
lmignon b79aebf
[FIX] readme
sbejaoui 8e74d07
Revert "[IMP] sale_order_line_cancel: Improve cancel process"
rousseldenis 483041b
[FIX] sale_order_line_cancel: Restore some features
rousseldenis 736014a
[IMP] sale_order_line_cancel: support kits
jbaudoux File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,96 @@ | ||
====================== | ||
Sale Order Line Cancel | ||
====================== | ||
|
||
.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
!! This file is generated by oca-gen-addon-readme !! | ||
!! changes will be overwritten. !! | ||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
|
||
.. |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/16.0/sale_order_line_cancel | ||
: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-16-0/sale-workflow-16-0-sale_order_line_cancel | ||
:alt: Translate me on Weblate | ||
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png | ||
:target: https://runboat.odoo-community.org/webui/builds.html?repo=OCA/sale-workflow&target_branch=16.0 | ||
:alt: Try me on Runboat | ||
|
||
|badge1| |badge2| |badge3| |badge4| |badge5| | ||
|
||
This module allows you to cancel the remaining quantity on sale order by adding | ||
a dedicated action to sale lines. It also add two new fields to track canceled | ||
and remaining to deliver quantities. | ||
|
||
This module differs from the original odoo behavior in the following way: | ||
|
||
* In odoo, if the update of the quantity ordered is allowed on the sale order at | ||
the confirmed state, odoo will recompute the required stock operations | ||
according to the new quantity. This change is possible | ||
even the stock operations are started for this sale order line. | ||
* In this module, the quantity ordered is not updated on the sale order line to | ||
keep track of the original ordered by the customer. At the same time, we | ||
cancel only the stock moves for the remaining qty to deliver. This is only | ||
possible if no operation is started for this sale order line. | ||
|
||
|
||
.. warning:: | ||
|
||
It's not recommended to use this module if the update of the quantity ordered | ||
on the sale order line is allowed the confirmed state. This could lead to | ||
unpredictable behavior. | ||
|
||
**Table of contents** | ||
|
||
.. contents:: | ||
:local: | ||
|
||
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 smashing it by providing a detailed and welcomed | ||
`feedback <https://github.com/OCA/sale-workflow/issues/new?body=module:%20sale_order_line_cancel%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 | ||
~~~~~~~ | ||
|
||
* Camptocamp | ||
* ACSONE SA/NV | ||
|
||
Contributors | ||
~~~~~~~~~~~~ | ||
|
||
* Sylvain Van Hoof <[email protected]> | ||
* Jacques-Etienne Baudoux (BCIM) <[email protected]> | ||
* Souheil Bejaoui <[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/16.0/sale_order_line_cancel>`_ project on GitHub. | ||
|
||
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
from . import models | ||
from . import wizards |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
# Copyright 2018 Sylvain Van Hoof (Okia SPRL) | ||
# Copyright 2018 Jacques-Etienne Baudoux (BCIM) <[email protected]> | ||
# Copyright 2023 ACSONE SA/NV | ||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). | ||
|
||
{ | ||
"name": "Sale Order Line Cancel", | ||
"version": "16.0.1.0.0", | ||
"author": "Okia, BCIM, Camptocamp, ACSONE SA/NV, Odoo Community Association (OCA)", | ||
"license": "AGPL-3", | ||
"category": "Sales", | ||
"summary": """Sale cancel remaining""", | ||
"depends": ["sale_stock"], | ||
"data": [ | ||
"security/sale_order_line_cancel.xml", | ||
"wizards/sale_order_line_cancel.xml", | ||
"views/sale_order.xml", | ||
"views/sale_order_line.xml", | ||
], | ||
"website": "https://github.com/OCA/sale-workflow", | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
from . import sale_order_line | ||
from . import stock_move | ||
from . import sale_order |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
# Copyright 2023 ACSONE SA/NV | ||
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). | ||
|
||
from odoo import models | ||
|
||
|
||
class SaleOrder(models.Model): | ||
|
||
_inherit = "sale.order" | ||
|
||
def action_draft(self): | ||
res = super().action_draft() | ||
orders = self.filtered(lambda s: s.state == "draft") | ||
orders.order_line.write({"product_qty_canceled": 0}) | ||
return res | ||
|
||
def _action_cancel(self): | ||
res = super()._action_cancel() | ||
orders = self.filtered(lambda s: s.state == "cancel") | ||
for line in orders.order_line: | ||
line.product_qty_canceled = line.product_uom_qty - line.qty_delivered | ||
return res |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
# Copyright 2018 Okia SPRL | ||
# Copyright 2018 Jacques-Etienne Baudoux (BCIM) <[email protected]> | ||
# Copyright 2020 ACSONE SA/NV | ||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). | ||
|
||
from odoo import _, api, fields, models | ||
from odoo.tools import float_compare | ||
|
||
|
||
class SaleOrderLine(models.Model): | ||
_inherit = "sale.order.line" | ||
|
||
product_qty_canceled = fields.Float( | ||
"Qty canceled", readonly=True, copy=False, digits="Product Unit of Measure" | ||
) | ||
product_qty_remains_to_deliver = fields.Float( | ||
string="Remains to deliver", | ||
digits="Product Unit of Measure", | ||
compute="_compute_product_qty_remains_to_deliver", | ||
store=True, | ||
) | ||
can_cancel_remaining_qty = fields.Boolean( | ||
compute="_compute_can_cancel_remaining_qty" | ||
) | ||
|
||
@api.depends("product_qty_remains_to_deliver", "state") | ||
def _compute_can_cancel_remaining_qty(self): | ||
precision = self.env["decimal.precision"].precision_get( | ||
"Product Unit of Measure" | ||
) | ||
for rec in self: | ||
rec.can_cancel_remaining_qty = ( | ||
float_compare( | ||
rec.product_qty_remains_to_deliver, 0, precision_digits=precision | ||
) | ||
== 1 | ||
and rec.state in ("sale", "done") | ||
and rec.qty_delivered_method == "stock_move" | ||
) | ||
|
||
@api.depends( | ||
"product_uom_qty", | ||
"qty_delivered", | ||
"product_qty_canceled", | ||
) | ||
def _compute_product_qty_remains_to_deliver(self): | ||
for line in self: | ||
qty_remaining = line.qty_to_deliver - line.product_qty_canceled | ||
line.product_qty_remains_to_deliver = qty_remaining | ||
|
||
def _get_moves_to_cancel(self): | ||
return self.move_ids.filtered(lambda m: m.state not in ("done", "cancel")) | ||
|
||
def _check_moves_to_cancel(self, moves): | ||
"""Override this method to add checks before cancel""" | ||
self.ensure_one() | ||
|
||
def _update_qty_canceled(self): | ||
"""Update SO line qty canceled only when all remaining moves are canceled""" | ||
for line in self: | ||
if line._get_moves_to_cancel(): | ||
continue | ||
line.product_qty_canceled = line.qty_to_deliver | ||
|
||
def cancel_remaining_qty(self): | ||
lines = self.filtered(lambda l: l.can_cancel_remaining_qty) | ||
for line in lines: | ||
moves_to_cancel = line._get_moves_to_cancel() | ||
line._check_moves_to_cancel(moves_to_cancel) | ||
moves_to_cancel._action_cancel() | ||
line.order_id.message_post( | ||
body=_( | ||
"<b>%(product)s</b>: The order line has been canceled", | ||
product=line.product_id.display_name, | ||
) | ||
) | ||
return True |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# Copyright 2023 ACSONE SA/NV | ||
# Copyright 2024 Jacques-Etienne Baudoux (BCIM) <[email protected]> | ||
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). | ||
|
||
from odoo import models | ||
|
||
|
||
class StockMove(models.Model): | ||
|
||
_inherit = "stock.move" | ||
|
||
def _action_cancel(self): | ||
sale_moves = self.filtered( | ||
lambda m: m.sale_line_id and m.state not in ("done", "cancel") | ||
) | ||
res = super()._action_cancel() | ||
sale_lines = sale_moves.filtered(lambda m: m.state == "cancel").sale_line_id | ||
sale_lines._update_qty_canceled() | ||
return res | ||
|
||
def _action_done(self, cancel_backorder=False): | ||
moves_todo = super()._action_done(cancel_backorder=cancel_backorder) | ||
if cancel_backorder and moves_todo: | ||
# _action_cancel is called before marking as done, so the hook on | ||
# _action_cancel will not be triggered. Call it now | ||
self.sale_line_id._update_qty_canceled() | ||
return moves_todo |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
* Sylvain Van Hoof <[email protected]> | ||
* Jacques-Etienne Baudoux (BCIM) <[email protected]> | ||
* Souheil Bejaoui <[email protected]> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
This module allows you to cancel the remaining quantity on sale order by adding | ||
a dedicated action to sale lines. It also add two new fields to track canceled | ||
and remaining to deliver quantities. | ||
|
||
This module differs from the original odoo behavior in the following way: | ||
|
||
* In odoo, if the update of the quantity ordered is allowed on the sale order at | ||
the confirmed state, odoo will recompute the required stock operations | ||
according to the new quantity. This change is possible | ||
even the stock operations are started for this sale order line. | ||
* In this module, the quantity ordered is not updated on the sale order line to | ||
keep track of the original ordered by the customer. At the same time, we | ||
cancel only the stock moves for the remaining qty to deliver. This is only | ||
possible if no operation is started for this sale order line. | ||
|
||
|
||
.. warning:: | ||
|
||
It's not recommended to use this module if the update of the quantity ordered | ||
on the sale order line is allowed the confirmed state. This could lead to | ||
unpredictable behavior. |
14 changes: 14 additions & 0 deletions
14
sale_order_line_cancel/security/sale_order_line_cancel.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
<?xml version="1.0" encoding="utf-8" ?> | ||
<!-- Copyright 2023 ACSONE SA/NV | ||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). --> | ||
<odoo> | ||
<record model="ir.model.access" id="sale_order_line_cancel_access"> | ||
<field name="name">sale.order.line.cancel access</field> | ||
<field name="model_id" ref="model_sale_order_line_cancel" /> | ||
<field name="group_id" ref="sales_team.group_sale_manager" /> | ||
<field name="perm_read" eval="1" /> | ||
<field name="perm_create" eval="1" /> | ||
<field name="perm_write" eval="1" /> | ||
<field name="perm_unlink" eval="1" /> | ||
</record> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. is it possible to add entry for users in groups sales_team.group_sale_salesman ? sale.order.line.cancel access own document |
||
</odoo> |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jbaudoux ,
The canceled quantity is not the same as the quantity to deliver because the quantity to deliver includes returned quantities.
For example, in an order of 10 units, if I deliver 8 and then cancel the remaining 2, and later my customer returns 2 units, I would expect the following values: