Skip to content

Commit

Permalink
Merge PR #800 into 16.0
Browse files Browse the repository at this point in the history
Signed-off-by jbaudoux
  • Loading branch information
OCA-git-bot committed Dec 8, 2023
2 parents 1cc423f + 54fb820 commit 372f6b2
Show file tree
Hide file tree
Showing 18 changed files with 732 additions and 0 deletions.
88 changes: 88 additions & 0 deletions delivery_carrier_warehouse/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
==========================
Delivery Carrier Warehouse
==========================

..
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:aaad6e436f29072ff24269ad77cf876decc6988282c421feb4e675026f15a6cf
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |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%2Fwms-lightgray.png?logo=github
:target: https://github.com/OCA/wms/tree/16.0/delivery_carrier_warehouse
:alt: OCA/wms
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/wms-16-0/wms-16-0-delivery_carrier_warehouse
: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/wms&target_branch=16.0
:alt: Try me on Runboat

|badge1| |badge2| |badge3| |badge4| |badge5|

This module allows to define a delivery carrier on stock warehouse.

If a partner does not have a default carrier defined, the 'Add shipping' wizard
will use the carrier defined on the warehouse as default.

**Table of contents**

.. contents::
:local:

Bug Tracker
===========

Bugs are tracked on `GitHub Issues <https://github.com/OCA/wms/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/wms/issues/new?body=module:%20delivery_carrier_warehouse%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

Contributors
~~~~~~~~~~~~

* Akim Juillerat <akim.juillerat@camptocamp.com>
* Phuc Tran Thanh <phuc@trobz.com>
* Fernando La Chica - GreenIce <fernandolachica@gmail.com>

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/wms <https://github.com/OCA/wms/tree/16.0/delivery_carrier_warehouse>`_ 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_carrier_warehouse/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from . import models
15 changes: 15 additions & 0 deletions delivery_carrier_warehouse/__manifest__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copyright 2020 Camptocamp SA
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
{
"name": "Delivery Carrier Warehouse",
"summary": "Get delivery method used in sales orders from warehouse",
"version": "16.0.1.0.0",
"category": "Operations/Inventory/Delivery",
"website": "https://github.com/OCA/wms",
"author": "Camptocamp, Odoo Community Association (OCA)",
"license": "AGPL-3",
"application": False,
"installable": True,
"depends": ["delivery"],
"data": ["views/stock_warehouse.xml"],
}
36 changes: 36 additions & 0 deletions delivery_carrier_warehouse/i18n/delivery_carrier_warehouse.pot
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * delivery_carrier_warehouse
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 15.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_carrier_warehouse
#: model:ir.model.fields,help:delivery_carrier_warehouse.field_stock_warehouse__delivery_carrier_id
msgid ""
"Default delivery method used in sales orders. Will be applied only if the "
"partner does not have a default delivery method."
msgstr ""

#. module: delivery_carrier_warehouse
#: model:ir.model.fields,field_description:delivery_carrier_warehouse.field_stock_warehouse__delivery_carrier_id
msgid "Delivery Method"
msgstr ""

#. module: delivery_carrier_warehouse
#: model:ir.model,name:delivery_carrier_warehouse.model_sale_order
msgid "Sales Order"
msgstr ""

#. module: delivery_carrier_warehouse
#: model:ir.model,name:delivery_carrier_warehouse.model_stock_warehouse
msgid "Warehouse"
msgstr ""
50 changes: 50 additions & 0 deletions delivery_carrier_warehouse/i18n/es_AR.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * delivery_carrier_warehouse
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 14.0\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2021-10-19 23:35+0000\n"
"Last-Translator: Ignacio Buioli <ibuioli@gmail.com>\n"
"Language-Team: none\n"
"Language: es_AR\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.3.2\n"

#. module: delivery_carrier_warehouse
#: model:ir.model.fields,help:delivery_carrier_warehouse.field_stock_warehouse__delivery_carrier_id
msgid ""
"Default delivery method used in sales orders. Will be applied only if the "
"partner does not have a default delivery method."
msgstr ""
"Método de entrega predeterminado utilizado en pedidos de venta. Se aplicará "
"solo si el contacto no tiene un método de entrega predeterminado."

#. module: delivery_carrier_warehouse
#: model:ir.model.fields,field_description:delivery_carrier_warehouse.field_stock_warehouse__delivery_carrier_id
msgid "Delivery Method"
msgstr "Método de Entrega"

#. module: delivery_carrier_warehouse
#: model:ir.model,name:delivery_carrier_warehouse.model_sale_order
msgid "Sales Order"
msgstr "Pedido de Venta"

#. module: delivery_carrier_warehouse
#: model:ir.model,name:delivery_carrier_warehouse.model_stock_warehouse
msgid "Warehouse"
msgstr "Almacén"

#~ msgid "Display Name"
#~ msgstr "Mostrar Nombre"

#~ msgid "ID"
#~ msgstr "ID"

#~ msgid "Last Modified on"
#~ msgstr "Última Modificación el"
2 changes: 2 additions & 0 deletions delivery_carrier_warehouse/models/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
from . import sale_order
from . import stock_warehouse
19 changes: 19 additions & 0 deletions delivery_carrier_warehouse/models/sale_order.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Copyright 2020 Camptocamp SA
# 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_open_delivery_wizard(self):
res = super().action_open_delivery_wizard()
wh_carrier = self.warehouse_id.delivery_carrier_id
if (
not self.env.context.get("carrier_recompute")
and not res["context"].get("default_carrier_id")
and wh_carrier
):
res["context"]["default_carrier_id"] = wh_carrier.id
return res
15 changes: 15 additions & 0 deletions delivery_carrier_warehouse/models/stock_warehouse.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copyright 2020 Camptocamp SA
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
from odoo import fields, models


class StockWarehouse(models.Model):

_inherit = "stock.warehouse"

delivery_carrier_id = fields.Many2one(
"delivery.carrier",
string="Delivery Method",
help="Default delivery method used in sales orders. Will be applied "
"only if the partner does not have a default delivery method.",
)
3 changes: 3 additions & 0 deletions delivery_carrier_warehouse/readme/CONTRIBUTORS.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
* Akim Juillerat <akim.juillerat@camptocamp.com>
* Phuc Tran Thanh <phuc@trobz.com>
* Fernando La Chica - GreenIce <fernandolachica@gmail.com>
3 changes: 3 additions & 0 deletions delivery_carrier_warehouse/readme/CREDITS.rst
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
4 changes: 4 additions & 0 deletions delivery_carrier_warehouse/readme/DESCRIPTION.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
This module allows to define a delivery carrier on stock warehouse.

If a partner does not have a default carrier defined, the 'Add shipping' wizard
will use the carrier defined on the warehouse as default.
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 372f6b2

Please sign in to comment.