Skip to content

Commit

Permalink
Merge PR OCA#1570 into 17.0
Browse files Browse the repository at this point in the history
Signed-off-by sebalix
  • Loading branch information
OCA-git-bot committed Jun 20, 2024
2 parents f62e658 + 88ba1bb commit 2a8d556
Show file tree
Hide file tree
Showing 20 changed files with 826 additions and 0 deletions.
110 changes: 110 additions & 0 deletions delivery_procurement_group_carrier/README.rst
Original file line number Diff line number Diff line change
@@ -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 <https://github.com/OCA/stock-logistics-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/stock-logistics-workflow/issues/new?body=module:%20delivery_procurement_group_carrier%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
-------

* Camptocamp
* BCIM

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

- Camptocamp:

- Alexandre Fayolle <[email protected]>
- Thierry Ducrest <[email protected]>

- BCIM:

- Jacques-Etienne Baudoux <[email protected]>

- TROBZ:

- Phuc Tran Thanh <[email protected]>

- Denis Roussel <[email protected]>
- `APSL <https://apsl.tech>`__:

- Antoni Marroig <[email protected]>

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 <https://github.com/OCA/stock-logistics-workflow/tree/17.0/delivery_procurement_group_carrier>`_ 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 delivery_procurement_group_carrier/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from . import models
18 changes: 18 additions & 0 deletions delivery_procurement_group_carrier/__manifest__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Copyright 2020 Camptocamp
# Copyright 2020-2021 Jacques-Etienne Baudoux (BCIM) <[email protected]>
# 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",
}
Original file line number Diff line number Diff line change
@@ -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 ""
37 changes: 37 additions & 0 deletions delivery_procurement_group_carrier/i18n/es.po
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>\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"
37 changes: 37 additions & 0 deletions delivery_procurement_group_carrier/i18n/it.po
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>\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"
1 change: 1 addition & 0 deletions delivery_procurement_group_carrier/models/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from . import procurement_group, sale_order, sale_order_line
11 changes: 11 additions & 0 deletions delivery_procurement_group_carrier/models/procurement_group.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Copyright 2020 Camptocamp (https://www.camptocamp.com)
# Copyright 2020-2021 Jacques-Etienne Baudoux (BCIM) <[email protected]>
# 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")
14 changes: 14 additions & 0 deletions delivery_procurement_group_carrier/models/sale_order.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Copyright 2020 Camptocamp (https://www.camptocamp.com)
# Copyright 2020-2021 Jacques-Etienne Baudoux (BCIM) <[email protected]>
# 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
14 changes: 14 additions & 0 deletions delivery_procurement_group_carrier/models/sale_order_line.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Copyright 2020 Camptocamp (https://www.camptocamp.com)
# Copyright 2020-2021 Jacques-Etienne Baudoux (BCIM) <[email protected]>
# 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
3 changes: 3 additions & 0 deletions delivery_procurement_group_carrier/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["whool"]
build-backend = "whool.buildapi"
10 changes: 10 additions & 0 deletions delivery_procurement_group_carrier/readme/CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- Camptocamp:
- Alexandre Fayolle \<<[email protected]>\>
- Thierry Ducrest \<<[email protected]>\>
- BCIM:
- Jacques-Etienne Baudoux \<<[email protected]>\>
- TROBZ:
- Phuc Tran Thanh \<<[email protected]>\>
- Denis Roussel \<<[email protected]>\>
- [APSL](https://apsl.tech):
- Antoni Marroig \<<[email protected]>\>
3 changes: 3 additions & 0 deletions delivery_procurement_group_carrier/readme/CREDITS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
The development of this module has been financially supported by:

- Camptocamp
11 changes: 11 additions & 0 deletions delivery_procurement_group_carrier/readme/DESCRIPTION.md
Original file line number Diff line number Diff line change
@@ -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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 2a8d556

Please sign in to comment.