diff --git a/setup/stock_picking_delivery_package/odoo/addons/stock_picking_delivery_package b/setup/stock_picking_delivery_package/odoo/addons/stock_picking_delivery_package new file mode 120000 index 0000000000..7cc57f31cd --- /dev/null +++ b/setup/stock_picking_delivery_package/odoo/addons/stock_picking_delivery_package @@ -0,0 +1 @@ +../../../../stock_picking_delivery_package \ No newline at end of file diff --git a/setup/stock_picking_delivery_package/setup.py b/setup/stock_picking_delivery_package/setup.py new file mode 100644 index 0000000000..28c57bb640 --- /dev/null +++ b/setup/stock_picking_delivery_package/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/stock_picking_delivery_package/README.rst b/stock_picking_delivery_package/README.rst new file mode 100644 index 0000000000..8538dfc919 --- /dev/null +++ b/stock_picking_delivery_package/README.rst @@ -0,0 +1,90 @@ +============================== +Stock Picking Delivery Package +============================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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/16.0/stock_picking_delivery_package + :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-16-0/delivery-carrier-16-0-stock_picking_delivery_package + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/99/16.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows to launch the wizard to choose a delivery package +in another flow than the output transfer. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +#. Go to Inventory > Configuration > Warehouse Management > Operation Types +#. On the operation type you want to use the feature, check the box + 'Launch Delivery Package Wizard' (you should have activated the Packages management before). + +Usage +===== + +After having activated the feature on Operation Type level, +fill in the quantities you want to transfer and click on +'Put in Pack' button. + +Then, as for deliveries, fill in the desired package type. + +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 +~~~~~~~ + +* ACSONE SA/NV + +Contributors +~~~~~~~~~~~~ + +* Denis Roussel + +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/stock_picking_delivery_package/__init__.py b/stock_picking_delivery_package/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/stock_picking_delivery_package/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/stock_picking_delivery_package/__manifest__.py b/stock_picking_delivery_package/__manifest__.py new file mode 100644 index 0000000000..35e7b81018 --- /dev/null +++ b/stock_picking_delivery_package/__manifest__.py @@ -0,0 +1,19 @@ +# Copyright 2023 ACSONE SA/NV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +{ + "name": "Stock Picking Delivery Package", + "summary": """ + This module allows to define a delivery package elsewhere than on the + delivery picking""", + "version": "16.0.1.0.0", + "license": "AGPL-3", + "author": "ACSONE SA/NV,Odoo Community Association (OCA)", + "website": "https://github.com/OCA/delivery-carrier", + "depends": [ + "stock_picking_delivery_link", + ], + "data": [ + "views/stock_picking_type.xml", + ], +} diff --git a/stock_picking_delivery_package/models/__init__.py b/stock_picking_delivery_package/models/__init__.py new file mode 100644 index 0000000000..dae0bb2efe --- /dev/null +++ b/stock_picking_delivery_package/models/__init__.py @@ -0,0 +1,2 @@ +from . import stock_picking +from . import stock_picking_type diff --git a/stock_picking_delivery_package/models/stock_picking.py b/stock_picking_delivery_package/models/stock_picking.py new file mode 100644 index 0000000000..af5836a553 --- /dev/null +++ b/stock_picking_delivery_package/models/stock_picking.py @@ -0,0 +1,28 @@ +# Copyright 2023 ACSONE SA/NV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import models + + +class StockPicking(models.Model): + + _inherit = "stock.picking" + + def _pre_put_in_pack_hook(self, move_line_ids): + """ + If the feature is enabled on picking type level, launch the + Choose Delivery Package wizard. As the default behaviour in delivery module + is to rely on carrier_id value (that we don't have in other operations than OUT). + """ + if self.ship_carrier_id and self.picking_type_id.launch_delivery_package_wizard: + result = self._set_delivery_package_type() + context = result.get("context", {}) + if context.get("current_package_carrier_type") != "none": + context.update( + { + "current_package_carrier_type": self.ship_carrier_id.delivery_type, + } + ) + result["context"] = context + return result + return super()._pre_put_in_pack_hook(move_line_ids) diff --git a/stock_picking_delivery_package/models/stock_picking_type.py b/stock_picking_delivery_package/models/stock_picking_type.py new file mode 100644 index 0000000000..961d4b1872 --- /dev/null +++ b/stock_picking_delivery_package/models/stock_picking_type.py @@ -0,0 +1,14 @@ +# Copyright 2023 ACSONE SA/NV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class StockPickingType(models.Model): + + _inherit = "stock.picking.type" + + launch_delivery_package_wizard = fields.Boolean( + help="When doing Put In Pack, launch the wizard to allow choosing the " + "Delivery Package Type" + ) diff --git a/stock_picking_delivery_package/readme/CONFIGURE.rst b/stock_picking_delivery_package/readme/CONFIGURE.rst new file mode 100644 index 0000000000..bac584e17c --- /dev/null +++ b/stock_picking_delivery_package/readme/CONFIGURE.rst @@ -0,0 +1,3 @@ +#. Go to Inventory > Configuration > Warehouse Management > Operation Types +#. On the operation type you want to use the feature, check the box + 'Launch Delivery Package Wizard' (you should have activated the Packages management before). diff --git a/stock_picking_delivery_package/readme/CONTRIBUTORS.rst b/stock_picking_delivery_package/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..9179ee4b8f --- /dev/null +++ b/stock_picking_delivery_package/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Denis Roussel diff --git a/stock_picking_delivery_package/readme/DESCRIPTION.rst b/stock_picking_delivery_package/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..c64f92ecec --- /dev/null +++ b/stock_picking_delivery_package/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +This module allows to launch the wizard to choose a delivery package +in another flow than the output transfer. diff --git a/stock_picking_delivery_package/readme/USAGE.rst b/stock_picking_delivery_package/readme/USAGE.rst new file mode 100644 index 0000000000..96b3e2ad15 --- /dev/null +++ b/stock_picking_delivery_package/readme/USAGE.rst @@ -0,0 +1,5 @@ +After having activated the feature on Operation Type level, +fill in the quantities you want to transfer and click on +'Put in Pack' button. + +Then, as for deliveries, fill in the desired package type. diff --git a/stock_picking_delivery_package/static/description/icon.png b/stock_picking_delivery_package/static/description/icon.png new file mode 100644 index 0000000000..3a0328b516 Binary files /dev/null and b/stock_picking_delivery_package/static/description/icon.png differ diff --git a/stock_picking_delivery_package/static/description/index.html b/stock_picking_delivery_package/static/description/index.html new file mode 100644 index 0000000000..c9b75416d3 --- /dev/null +++ b/stock_picking_delivery_package/static/description/index.html @@ -0,0 +1,437 @@ + + + + + + +Stock Picking Delivery Package + + + +
+

Stock Picking Delivery Package

+ + +

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

+

This module allows to launch the wizard to choose a delivery package +in another flow than the output transfer.

+

Table of contents

+ +
+

Configuration

+
    +
  1. Go to Inventory > Configuration > Warehouse Management > Operation Types
    2. +
  2. On the operation type you want to use the feature, check the box +‘Launch Delivery Package Wizard’ (you should have activated the Packages management before).
    3. +
+
+
+

Usage

+

After having activated the feature on Operation Type level, +fill in the quantities you want to transfer and click on +‘Put in Pack’ button.

+

Then, as for deliveries, fill in the desired package type.

+
+
+

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

+
    +
  • ACSONE SA/NV
    • +
+
+
+

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/stock_picking_delivery_package/tests/__init__.py b/stock_picking_delivery_package/tests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/stock_picking_delivery_package/tests/test_picking_delivery_package.py b/stock_picking_delivery_package/tests/test_picking_delivery_package.py new file mode 100644 index 0000000000..a43fb56dfe --- /dev/null +++ b/stock_picking_delivery_package/tests/test_picking_delivery_package.py @@ -0,0 +1,97 @@ +# Copyright 2023 ACSONE SA/NV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo import Command +from odoo.tests.common import TransactionCase + + +class TestStockPickingDeliveryPackage(TransactionCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.warehouse = cls.env.ref("stock.warehouse0") + cls.stock_move_obj = cls.env["stock.move"] + cls.warehouse.delivery_steps = "pick_ship" + cls.pick_type = cls.warehouse.pick_type_id + + cls.location_out = cls.env.ref("stock.stock_location_output") + cls.location_customers = cls.env.ref("stock.stock_location_customers") + + cls.delivery_product = cls.env["product.product"].create( + { + "name": "Delivery Test", + "type": "service", + } + ) + cls.carrier = cls.env["delivery.carrier"].create( + { + "name": "Delivery Test", + "product_id": cls.delivery_product.id, + } + ) + + cls.route = cls.env["stock.route"].search( + [ + ("rule_ids.location_dest_id", "=", cls.location_customers.id), + ("rule_ids.location_src_id", "=", cls.location_out.id), + ], + limit=1, + ) + cls.rule_out = cls.route.rule_ids.filtered( + lambda r: r.location_dest_id == cls.location_customers + ) + + cls.pick_type.launch_delivery_package_wizard = True + cls.package_type = cls.env["stock.package.type"].create( + {"name": "Package Type A"} + ) + + cls.product = cls.env["product.product"].create( + { + "name": "Product Test", + "type": "product", + "route_ids": [Command.link(cls.route.id)], + } + ) + cls._create_qty() + cls.group = cls.env["procurement.group"].create({"name": "Test"}) + cls.env["procurement.group"].run( + [ + cls.group.Procurement( + cls.product, + 2.0, + cls.product.uom_id, + cls.location_customers, + cls.product.name, + "test", + cls.warehouse.company_id, + {}, + ) + ] + ) + cls.move_pick = cls.stock_move_obj.search( + [ + ("product_id", "=", cls.product.id), + ("location_dest_id", "=", cls.location_out.id), + ] + ) + cls.move_out = cls.stock_move_obj.search( + [ + ("product_id", "=", cls.product.id), + ("location_dest_id", "=", cls.location_customers.id), + ] + ) + cls.move_out.picking_id.carrier_id = cls.carrier + + @classmethod + def _create_qty(cls): + cls.env["stock.quant"].with_context(inventory_mode=True).create( + { + "product_id": cls.product.id, + "inventory_quantity": 10.0, + "location_id": cls.env.ref("stock.stock_location_stock").id, + } + )._apply_inventory() + + def test_picking_delivery(self): + result = self.move_pick.picking_id.action_put_in_pack() + self.assertEqual(result.get("res_model"), "choose.delivery.package") diff --git a/stock_picking_delivery_package/views/stock_picking_type.xml b/stock_picking_delivery_package/views/stock_picking_type.xml new file mode 100644 index 0000000000..fc6fd1a360 --- /dev/null +++ b/stock_picking_delivery_package/views/stock_picking_type.xml @@ -0,0 +1,22 @@ + + + + + + stock.picking.type.form (in stock_picking_delivery_package) + stock.picking.type + + + + + + + + +