diff --git a/delivery_line_qty_delivered/README.rst b/delivery_line_qty_delivered/README.rst new file mode 100644 index 0000000000..b34de29a2a --- /dev/null +++ b/delivery_line_qty_delivered/README.rst @@ -0,0 +1,75 @@ +=========================== +delivery_line_qty_delivered +=========================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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%2Fdelivery--carrier-lightgray.png?logo=github + :target: https://github.com/OCA/delivery-carrier/tree/14.0/delivery_line_qty_delivered + :alt: OCA/delivery-carrier +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/delivery-carrier-14-0/delivery-carrier-14-0-delivery_line_qty_delivered + :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/delivery-carrier&target_branch=14.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +Changes the Delivered Quantity (qty_delivered) of a delivery sale.order.line +if one other sale.order.line is delivered the qty_delivered of the delivery line +is changed to its Quantity (product_uom_qty) + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub 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 `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Michael Tietz (MT Software) + +Contributors +~~~~~~~~~~~~ + +* Michael Tietz (MT Software) + +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/delivery-carrier `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/delivery_line_qty_delivered/__init__.py b/delivery_line_qty_delivered/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/delivery_line_qty_delivered/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/delivery_line_qty_delivered/__manifest__.py b/delivery_line_qty_delivered/__manifest__.py new file mode 100644 index 0000000000..0ff88f0c45 --- /dev/null +++ b/delivery_line_qty_delivered/__manifest__.py @@ -0,0 +1,18 @@ +# Copyright 2022 Michael Tietz (MT Software) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +{ + "name": "delivery_line_qty_delivered", + "summary": "Changes the Delivered Quantity (qty_delivered) of a delivery sale.order.line" + "if one other sale.order.line is delivered the qty_delivered of the delivery line" + "is changed to its Quantity (product_uom_qty)", + "version": "14.0.1.0.0", + "license": "AGPL-3", + "author": "Michael Tietz (MT Software) ," + "Odoo Community Association (OCA)", + "website": "https://github.com/OCA/delivery-carrier", + "depends": [ + "delivery", + ], + "installable": True, +} diff --git a/delivery_line_qty_delivered/models/__init__.py b/delivery_line_qty_delivered/models/__init__.py new file mode 100644 index 0000000000..8eb9d1d404 --- /dev/null +++ b/delivery_line_qty_delivered/models/__init__.py @@ -0,0 +1 @@ +from . import sale_order_line diff --git a/delivery_line_qty_delivered/models/sale_order_line.py b/delivery_line_qty_delivered/models/sale_order_line.py new file mode 100644 index 0000000000..238c074d11 --- /dev/null +++ b/delivery_line_qty_delivered/models/sale_order_line.py @@ -0,0 +1,41 @@ +# Copyright 2022 Michael Tietz (MT Software) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import api, fields, models +from odoo.tools import float_is_zero, groupby + + +class SaleOrderLine(models.Model): + _inherit = "sale.order.line" + + qty_delivered_method = fields.Selection(selection_add=[("delivery", "Delivery")]) + + @api.depends("product_id", "is_delivery") + def _compute_qty_delivered_method(self): + super(SaleOrderLine, self)._compute_qty_delivered_method() + for line in self: + if line._is_delivery() and line.product_id.type == "service": + line.qty_delivered_method = "delivery" + + def _get_delivery_qty_delivered(self, delivered): + self.ensure_one() + if delivered: + return self.product_uom_qty + return 0.0 + + def _compute_qty_delivered(self): + super(SaleOrderLine, self)._compute_qty_delivered() + precision = self.env["decimal.precision"].precision_get( + "Product Unit of Measure" + ) + lines_grouped = groupby(self, lambda l: l.order_id) + for order, lines in lines_grouped: + lines = dict(groupby(order.order_line, lambda l: l.qty_delivered_method)) + if "delivery" not in lines or "stock_move" not in lines: + continue + delivered = any( + not float_is_zero(line.qty_delivered, precision) + for line in lines["stock_move"] + ) + for line in lines["delivery"]: + line.qty_delivered = line._get_delivery_qty_delivered(delivered) diff --git a/delivery_line_qty_delivered/readme/CONTRIBUTORS.rst b/delivery_line_qty_delivered/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..446fd1d576 --- /dev/null +++ b/delivery_line_qty_delivered/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Michael Tietz (MT Software) diff --git a/delivery_line_qty_delivered/readme/DESCRIPTION.rst b/delivery_line_qty_delivered/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..dcb7eea777 --- /dev/null +++ b/delivery_line_qty_delivered/readme/DESCRIPTION.rst @@ -0,0 +1,3 @@ +Changes the Delivered Quantity (qty_delivered) of a delivery sale.order.line +if one other sale.order.line is delivered the qty_delivered of the delivery line +is changed to its Quantity (product_uom_qty) diff --git a/delivery_line_qty_delivered/static/description/index.html b/delivery_line_qty_delivered/static/description/index.html new file mode 100644 index 0000000000..08ada92a76 --- /dev/null +++ b/delivery_line_qty_delivered/static/description/index.html @@ -0,0 +1,421 @@ + + + + + + +delivery_line_qty_delivered + + + +
+

delivery_line_qty_delivered

+ + +

Beta License: AGPL-3 OCA/delivery-carrier Translate me on Weblate Try me on Runboat

+

Changes the Delivered Quantity (qty_delivered) of a delivery sale.order.line +if one other sale.order.line is delivered the qty_delivered of the delivery line +is changed to its Quantity (product_uom_qty)

+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub 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.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+ +
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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/delivery-carrier project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/delivery_line_qty_delivered/tests/__init__.py b/delivery_line_qty_delivered/tests/__init__.py new file mode 100644 index 0000000000..ac5295d022 --- /dev/null +++ b/delivery_line_qty_delivered/tests/__init__.py @@ -0,0 +1 @@ +from . import test_delivery_line_qty_delivered diff --git a/delivery_line_qty_delivered/tests/test_delivery_line_qty_delivered.py b/delivery_line_qty_delivered/tests/test_delivery_line_qty_delivered.py new file mode 100644 index 0000000000..f3866631ed --- /dev/null +++ b/delivery_line_qty_delivered/tests/test_delivery_line_qty_delivered.py @@ -0,0 +1,110 @@ +# Copyright 2022 Michael Tietz (MT Software) + +from odoo.tests import Form, tagged + +from odoo.addons.sale.tests.common import TestSaleCommonBase +from odoo.addons.stock_account.tests.test_anglo_saxon_valuation_reconciliation_common import ( + ValuationReconciliationTestCommon, +) + + +@tagged("post_install", "-at_install") +class TestDeliveryLineQtyDelivered( + TestSaleCommonBase, ValuationReconciliationTestCommon +): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.product = cls.env["product.product"].create( + {"name": "Stockable", "type": "product", "invoice_policy": "delivery"} + ) + cls.delivery = cls.product.create( + {"name": "Delivery", "type": "service", "invoice_policy": "delivery"} + ) + + def _new_sale_order(self): + warehouse = self.company_data["default_warehouse"] + self.env["stock.quant"]._update_available_quantity( + self.product, warehouse.lot_stock_id, 10 + ) + self.so = self.env["sale.order"].create( + { + "partner_id": self.env.ref("base.main_partner").id, + "order_line": [ + ( + 0, + 0, + { + "product_id": self.product.id, + "product_uom_qty": 1, + "product_uom": self.product.uom_id.id, + "price_unit": 1, + }, + ), + ( + 0, + 0, + { + "product_id": self.delivery.id, + "product_uom_qty": 1, + "product_uom": self.delivery.uom_id.id, + "price_unit": 1, + "is_delivery": True, + }, + ), + ], + "picking_policy": "direct", + } + ) + + def _check_qty_delivered(self, sum_qty_delivered): + self.so.flush() + self.so.order_line.flush() + self.assertEqual( + sum(self.so.order_line.mapped("qty_delivered")), sum_qty_delivered + ) + + def _deliver_order(self): + pick = self.so.picking_ids + pick.move_lines.write({"quantity_done": 1}) + pick.button_validate() + + def _return_order(self): + # Create return picking + stock_return_picking_form = Form( + self.env["stock.return.picking"].with_context( + active_ids=self.so.picking_ids.ids, + active_id=self.so.picking_ids.id, + active_model="stock.picking", + ) + ) + return_wiz = stock_return_picking_form.save() + return_wiz.product_return_moves.quantity = 1.0 + return_wiz.product_return_moves.to_refund = True + res = return_wiz.create_returns() + return_pick = self.env["stock.picking"].browse(res["res_id"]) + + # Validate picking + return_pick.move_lines.write({"quantity_done": 1}) + return_pick.button_validate() + + def test_delivery_qty_delivered(self): + self._new_sale_order() + self._check_qty_delivered(0) + + self.so.action_confirm() + self._check_qty_delivered(0) + + self._deliver_order() + self._check_qty_delivered(2) + + self._return_order() + self._check_qty_delivered(0) + + def test_delivery_qty_delivered_policy_order(self): + self.delivery.invoice_policy = "order" + self._new_sale_order() + self._check_qty_delivered(0) + + self.so.action_confirm() + self._check_qty_delivered(0) diff --git a/setup/delivery_line_qty_delivered/odoo/addons/delivery_line_qty_delivered b/setup/delivery_line_qty_delivered/odoo/addons/delivery_line_qty_delivered new file mode 120000 index 0000000000..d9f6841f7b --- /dev/null +++ b/setup/delivery_line_qty_delivered/odoo/addons/delivery_line_qty_delivered @@ -0,0 +1 @@ +../../../../delivery_line_qty_delivered \ No newline at end of file diff --git a/setup/delivery_line_qty_delivered/setup.py b/setup/delivery_line_qty_delivered/setup.py new file mode 100644 index 0000000000..28c57bb640 --- /dev/null +++ b/setup/delivery_line_qty_delivered/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)