diff --git a/delivery_procurement_group_carrier/README.rst b/delivery_procurement_group_carrier/README.rst new file mode 100644 index 000000000000..3886f6afba93 --- /dev/null +++ b/delivery_procurement_group_carrier/README.rst @@ -0,0 +1,110 @@ +================================== +Delivery Procurement Group Carrier +================================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:2218345b8e1d45d4b07583f5ddece57ddbfac88bd027d6c978ecec0a8186fa01 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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%2Fstock--logistics--workflow-lightgray.png?logo=github + :target: https://github.com/OCA/stock-logistics-workflow/tree/17.0/delivery_procurement_group_carrier + :alt: OCA/stock-logistics-workflow +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/stock-logistics-workflow-17-0/stock-logistics-workflow-17-0-delivery_procurement_group_carrier + :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/stock-logistics-workflow&target_branch=17.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This is a base module that propagates the SO carrier to the procurement +group. + +Having the carrier on the procurement group allows to apply different +routing for each carrier thanks to the dynamic routing. A rule domain +can then be expressed based on the delivery carrier. See the module +stock_dynamic_routing in OCA/wms. + +The carrier on the procurement group is also used for grouping several +SO in a same delivery by carrier. See the module +stock_picking_group_by_partner_by_carrier in this repository. + +**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 to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +------- + +* Camptocamp +* BCIM + +Contributors +------------ + +- Camptocamp: + + - Alexandre Fayolle + - Thierry Ducrest + +- BCIM: + + - Jacques-Etienne Baudoux + +- TROBZ: + + - Phuc Tran Thanh + +- Denis Roussel +- `APSL `__: + + - Antoni Marroig + +Other credits +------------- + +The development of this module has been financially supported by: + +- Camptocamp + +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/stock-logistics-workflow `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/delivery_procurement_group_carrier/__init__.py b/delivery_procurement_group_carrier/__init__.py new file mode 100644 index 000000000000..0650744f6bc6 --- /dev/null +++ b/delivery_procurement_group_carrier/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/delivery_procurement_group_carrier/__manifest__.py b/delivery_procurement_group_carrier/__manifest__.py new file mode 100644 index 000000000000..2adf43273916 --- /dev/null +++ b/delivery_procurement_group_carrier/__manifest__.py @@ -0,0 +1,18 @@ +# Copyright 2020 Camptocamp +# Copyright 2020-2021 Jacques-Etienne Baudoux (BCIM) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +{ + "name": "Delivery Procurement Group Carrier", + "Summary": "Record the carrier on the procurement group", + "version": "17.0.1.0.0", + "author": "Camptocamp, BCIM, Odoo Community Association (OCA)", + "website": "https://github.com/OCA/stock-logistics-workflow", + "category": "Warehouse Management", + "depends": ["sale_stock", "delivery"], + "data": [ + "views/procurement_group.xml", + ], + "installable": True, + "license": "AGPL-3", +} diff --git a/delivery_procurement_group_carrier/i18n/delivery_procurement_group_carrier.pot b/delivery_procurement_group_carrier/i18n/delivery_procurement_group_carrier.pot new file mode 100644 index 000000000000..dae903d64730 --- /dev/null +++ b/delivery_procurement_group_carrier/i18n/delivery_procurement_group_carrier.pot @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * delivery_procurement_group_carrier +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: delivery_procurement_group_carrier +#: model:ir.model.fields,field_description:delivery_procurement_group_carrier.field_procurement_group__carrier_id +msgid "Delivery Method" +msgstr "" + +#. module: delivery_procurement_group_carrier +#: model:ir.model,name:delivery_procurement_group_carrier.model_procurement_group +msgid "Procurement Group" +msgstr "" + +#. module: delivery_procurement_group_carrier +#: model:ir.model,name:delivery_procurement_group_carrier.model_sale_order +msgid "Sales Order" +msgstr "" + +#. module: delivery_procurement_group_carrier +#: model:ir.model,name:delivery_procurement_group_carrier.model_sale_order_line +msgid "Sales Order Line" +msgstr "" diff --git a/delivery_procurement_group_carrier/i18n/es.po b/delivery_procurement_group_carrier/i18n/es.po new file mode 100644 index 000000000000..2eb6da709892 --- /dev/null +++ b/delivery_procurement_group_carrier/i18n/es.po @@ -0,0 +1,37 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * delivery_procurement_group_carrier +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2024-01-30 13:35+0000\n" +"Last-Translator: Ivorra78 \n" +"Language-Team: none\n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" + +#. module: delivery_procurement_group_carrier +#: model:ir.model.fields,field_description:delivery_procurement_group_carrier.field_procurement_group__carrier_id +msgid "Delivery Method" +msgstr "Método de Entrega" + +#. module: delivery_procurement_group_carrier +#: model:ir.model,name:delivery_procurement_group_carrier.model_procurement_group +msgid "Procurement Group" +msgstr "Grupo de Adquisiciones" + +#. module: delivery_procurement_group_carrier +#: model:ir.model,name:delivery_procurement_group_carrier.model_sale_order +msgid "Sales Order" +msgstr "Orden de Ventas" + +#. module: delivery_procurement_group_carrier +#: model:ir.model,name:delivery_procurement_group_carrier.model_sale_order_line +msgid "Sales Order Line" +msgstr "Línea de Orden de Ventas" diff --git a/delivery_procurement_group_carrier/i18n/it.po b/delivery_procurement_group_carrier/i18n/it.po new file mode 100644 index 000000000000..51db500800dc --- /dev/null +++ b/delivery_procurement_group_carrier/i18n/it.po @@ -0,0 +1,37 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * delivery_procurement_group_carrier +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2023-11-21 14:34+0000\n" +"Last-Translator: mymage \n" +"Language-Team: none\n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" + +#. module: delivery_procurement_group_carrier +#: model:ir.model.fields,field_description:delivery_procurement_group_carrier.field_procurement_group__carrier_id +msgid "Delivery Method" +msgstr "Metodo di consegna" + +#. module: delivery_procurement_group_carrier +#: model:ir.model,name:delivery_procurement_group_carrier.model_procurement_group +msgid "Procurement Group" +msgstr "Gruppo di approvvigionamento" + +#. module: delivery_procurement_group_carrier +#: model:ir.model,name:delivery_procurement_group_carrier.model_sale_order +msgid "Sales Order" +msgstr "Ordine di vendita" + +#. module: delivery_procurement_group_carrier +#: model:ir.model,name:delivery_procurement_group_carrier.model_sale_order_line +msgid "Sales Order Line" +msgstr "Riga ordine di vendita" diff --git a/delivery_procurement_group_carrier/models/__init__.py b/delivery_procurement_group_carrier/models/__init__.py new file mode 100644 index 000000000000..079c861f2afc --- /dev/null +++ b/delivery_procurement_group_carrier/models/__init__.py @@ -0,0 +1 @@ +from . import procurement_group, sale_order, sale_order_line diff --git a/delivery_procurement_group_carrier/models/procurement_group.py b/delivery_procurement_group_carrier/models/procurement_group.py new file mode 100644 index 000000000000..cb96a1198ca4 --- /dev/null +++ b/delivery_procurement_group_carrier/models/procurement_group.py @@ -0,0 +1,11 @@ +# Copyright 2020 Camptocamp (https://www.camptocamp.com) +# Copyright 2020-2021 Jacques-Etienne Baudoux (BCIM) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from odoo import fields, models + + +class ProcurementGroup(models.Model): + _inherit = "procurement.group" + + carrier_id = fields.Many2one("delivery.carrier", string="Delivery Method") diff --git a/delivery_procurement_group_carrier/models/sale_order.py b/delivery_procurement_group_carrier/models/sale_order.py new file mode 100644 index 000000000000..6acf6ff486a9 --- /dev/null +++ b/delivery_procurement_group_carrier/models/sale_order.py @@ -0,0 +1,14 @@ +# Copyright 2020 Camptocamp (https://www.camptocamp.com) +# Copyright 2020-2021 Jacques-Etienne Baudoux (BCIM) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from odoo import models + + +class SaleOrder(models.Model): + _inherit = "sale.order" + + def action_draft(self): + res = super().action_draft() + self.procurement_group_id = False + return res diff --git a/delivery_procurement_group_carrier/models/sale_order_line.py b/delivery_procurement_group_carrier/models/sale_order_line.py new file mode 100644 index 000000000000..e0aec3f7f4a8 --- /dev/null +++ b/delivery_procurement_group_carrier/models/sale_order_line.py @@ -0,0 +1,14 @@ +# Copyright 2020 Camptocamp (https://www.camptocamp.com) +# Copyright 2020-2021 Jacques-Etienne Baudoux (BCIM) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from odoo import models + + +class SaleOrderLine(models.Model): + _inherit = "sale.order.line" + + def _prepare_procurement_group_vals(self): + vals = super()._prepare_procurement_group_vals() + vals["carrier_id"] = self.order_id.carrier_id.id + return vals diff --git a/delivery_procurement_group_carrier/pyproject.toml b/delivery_procurement_group_carrier/pyproject.toml new file mode 100644 index 000000000000..4231d0cccb3d --- /dev/null +++ b/delivery_procurement_group_carrier/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" diff --git a/delivery_procurement_group_carrier/readme/CONTRIBUTORS.md b/delivery_procurement_group_carrier/readme/CONTRIBUTORS.md new file mode 100644 index 000000000000..ef3a3b4eabd9 --- /dev/null +++ b/delivery_procurement_group_carrier/readme/CONTRIBUTORS.md @@ -0,0 +1,10 @@ +- Camptocamp: + - Alexandre Fayolle \<\> + - Thierry Ducrest \<\> +- BCIM: + - Jacques-Etienne Baudoux \<\> +- TROBZ: + - Phuc Tran Thanh \<\> +- Denis Roussel \<\> +- [APSL](https://apsl.tech): + - Antoni Marroig \<\> diff --git a/delivery_procurement_group_carrier/readme/CREDITS.md b/delivery_procurement_group_carrier/readme/CREDITS.md new file mode 100644 index 000000000000..705d3b30cad9 --- /dev/null +++ b/delivery_procurement_group_carrier/readme/CREDITS.md @@ -0,0 +1,3 @@ +The development of this module has been financially supported by: + +- Camptocamp diff --git a/delivery_procurement_group_carrier/readme/DESCRIPTION.md b/delivery_procurement_group_carrier/readme/DESCRIPTION.md new file mode 100644 index 000000000000..2af1ebcbe94a --- /dev/null +++ b/delivery_procurement_group_carrier/readme/DESCRIPTION.md @@ -0,0 +1,11 @@ +This is a base module that propagates the SO carrier to the procurement +group. + +Having the carrier on the procurement group allows to apply different +routing for each carrier thanks to the dynamic routing. A rule domain +can then be expressed based on the delivery carrier. See the module +stock_dynamic_routing in OCA/wms. + +The carrier on the procurement group is also used for grouping several +SO in a same delivery by carrier. See the module +stock_picking_group_by_partner_by_carrier in this repository. diff --git a/delivery_procurement_group_carrier/static/description/icon.png b/delivery_procurement_group_carrier/static/description/icon.png new file mode 100644 index 000000000000..3a0328b516c4 Binary files /dev/null and b/delivery_procurement_group_carrier/static/description/icon.png differ diff --git a/delivery_procurement_group_carrier/static/description/index.html b/delivery_procurement_group_carrier/static/description/index.html new file mode 100644 index 000000000000..c9c82133aec7 --- /dev/null +++ b/delivery_procurement_group_carrier/static/description/index.html @@ -0,0 +1,455 @@ + + + + + + +Delivery Procurement Group Carrier + + + +
+

Delivery Procurement Group Carrier

+ + +

Beta License: AGPL-3 OCA/stock-logistics-workflow Translate me on Weblate Try me on Runboat

+

This is a base module that propagates the SO carrier to the procurement +group.

+

Having the carrier on the procurement group allows to apply different +routing for each carrier thanks to the dynamic routing. A rule domain +can then be expressed based on the delivery carrier. See the module +stock_dynamic_routing in OCA/wms.

+

The carrier on the procurement group is also used for grouping several +SO in a same delivery by carrier. See the module +stock_picking_group_by_partner_by_carrier in this repository.

+

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 to smash it by providing a detailed and welcomed +feedback.

+

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

+
+
+

Credits

+
+

Authors

+
    +
  • Camptocamp
    • +
  • BCIM
    • +
+
+
+

Contributors

+ +
+
+

Other credits

+

The development of this module has been financially supported by:

+
    +
  • Camptocamp
    • +
+
+
+

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/stock-logistics-workflow project on GitHub.

+

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

+
+
+
+ + diff --git a/delivery_procurement_group_carrier/static/src/scss/report_delivery_slip.scss b/delivery_procurement_group_carrier/static/src/scss/report_delivery_slip.scss new file mode 100644 index 000000000000..90d99cc80012 --- /dev/null +++ b/delivery_procurement_group_carrier/static/src/scss/report_delivery_slip.scss @@ -0,0 +1,3 @@ +.remaining-to-deliver-separator { + background-color: #c6c6c6; +} diff --git a/delivery_procurement_group_carrier/tests/__init__.py b/delivery_procurement_group_carrier/tests/__init__.py new file mode 100644 index 000000000000..57c1b3fba877 --- /dev/null +++ b/delivery_procurement_group_carrier/tests/__init__.py @@ -0,0 +1 @@ +from . import test_carrier diff --git a/delivery_procurement_group_carrier/tests/test_carrier.py b/delivery_procurement_group_carrier/tests/test_carrier.py new file mode 100644 index 000000000000..1a803e17f8af --- /dev/null +++ b/delivery_procurement_group_carrier/tests/test_carrier.py @@ -0,0 +1,50 @@ +# Copyright 2020 Camptocamp (https://www.camptocamp.com) +# Copyright 2020 Jacques-Etienne Baudoux (BCIM) +# Copyright 2022 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo.tests.common import TransactionCase + + +class TestProcurementGroupCarrier(TransactionCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True)) + cls.carrier1 = cls.env["delivery.carrier"].create( + { + "name": "My Test Carrier", + "product_id": cls.env.ref("delivery.product_product_delivery").id, + } + ) + cls.partner = cls.env["res.partner"].create({"name": "Test Partner"}) + + def test_sale_procurement_group_carrier(self): + """Check the SO procurement group contains the carrier on SO confirmation""" + product = self.env.ref("product.product_delivery_01") + + sale_order_line_vals = { + "product_id": product.id, + } + sale_order_vals = { + "partner_id": self.partner.id, + "order_line": [(0, 0, sale_order_line_vals)], + } + sale = self.env["sale.order"].create(sale_order_vals) + + wiz_action = sale.action_open_delivery_wizard() + choose_delivery_carrier = ( + self.env[wiz_action["res_model"]] + .with_context(**wiz_action["context"]) + .create({"carrier_id": self.carrier1.id, "order_id": sale.id}) + ) + choose_delivery_carrier.button_confirm() + sale.action_confirm() + self.assertTrue(sale.picking_ids) + self.assertTrue(sale.procurement_group_id.carrier_id) + self.assertEqual(sale.procurement_group_id.carrier_id, sale.carrier_id) + + # Set SO to draft + # Check procurement group is reset + sale.action_draft() + self.assertFalse(sale.procurement_group_id) diff --git a/delivery_procurement_group_carrier/views/procurement_group.xml b/delivery_procurement_group_carrier/views/procurement_group.xml new file mode 100644 index 000000000000..09746589280a --- /dev/null +++ b/delivery_procurement_group_carrier/views/procurement_group.xml @@ -0,0 +1,13 @@ + + + + procurement.group.form + procurement.group + + + + + + + +