diff --git a/delivery_carrier_warehouse/README.rst b/delivery_carrier_warehouse/README.rst new file mode 100644 index 0000000000..ab66c6c3fc --- /dev/null +++ b/delivery_carrier_warehouse/README.rst @@ -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 `_. +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 + +Contributors +~~~~~~~~~~~~ + +* Akim Juillerat +* Phuc Tran Thanh +* Fernando La Chica - GreenIce + +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 `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/delivery_carrier_warehouse/__init__.py b/delivery_carrier_warehouse/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/delivery_carrier_warehouse/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/delivery_carrier_warehouse/__manifest__.py b/delivery_carrier_warehouse/__manifest__.py new file mode 100644 index 0000000000..c3f618e0fa --- /dev/null +++ b/delivery_carrier_warehouse/__manifest__.py @@ -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"], +} diff --git a/delivery_carrier_warehouse/i18n/delivery_carrier_warehouse.pot b/delivery_carrier_warehouse/i18n/delivery_carrier_warehouse.pot new file mode 100644 index 0000000000..0b878b0d90 --- /dev/null +++ b/delivery_carrier_warehouse/i18n/delivery_carrier_warehouse.pot @@ -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 "" diff --git a/delivery_carrier_warehouse/i18n/es_AR.po b/delivery_carrier_warehouse/i18n/es_AR.po new file mode 100644 index 0000000000..67df4f57ca --- /dev/null +++ b/delivery_carrier_warehouse/i18n/es_AR.po @@ -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 \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" diff --git a/delivery_carrier_warehouse/models/__init__.py b/delivery_carrier_warehouse/models/__init__.py new file mode 100644 index 0000000000..95c82ddaa5 --- /dev/null +++ b/delivery_carrier_warehouse/models/__init__.py @@ -0,0 +1,2 @@ +from . import sale_order +from . import stock_warehouse diff --git a/delivery_carrier_warehouse/models/sale_order.py b/delivery_carrier_warehouse/models/sale_order.py new file mode 100644 index 0000000000..6e085a2da3 --- /dev/null +++ b/delivery_carrier_warehouse/models/sale_order.py @@ -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 diff --git a/delivery_carrier_warehouse/models/stock_warehouse.py b/delivery_carrier_warehouse/models/stock_warehouse.py new file mode 100644 index 0000000000..95c80beb10 --- /dev/null +++ b/delivery_carrier_warehouse/models/stock_warehouse.py @@ -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.", + ) diff --git a/delivery_carrier_warehouse/readme/CONTRIBUTORS.rst b/delivery_carrier_warehouse/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..d5773bb395 --- /dev/null +++ b/delivery_carrier_warehouse/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* Akim Juillerat +* Phuc Tran Thanh +* Fernando La Chica - GreenIce diff --git a/delivery_carrier_warehouse/readme/CREDITS.rst b/delivery_carrier_warehouse/readme/CREDITS.rst new file mode 100644 index 0000000000..f5cc070c78 --- /dev/null +++ b/delivery_carrier_warehouse/readme/CREDITS.rst @@ -0,0 +1,3 @@ +The development of this module has been financially supported by: + +* Camptocamp diff --git a/delivery_carrier_warehouse/readme/DESCRIPTION.rst b/delivery_carrier_warehouse/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..700fcce5fc --- /dev/null +++ b/delivery_carrier_warehouse/readme/DESCRIPTION.rst @@ -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. diff --git a/delivery_carrier_warehouse/static/description/icon.png b/delivery_carrier_warehouse/static/description/icon.png new file mode 100644 index 0000000000..3a0328b516 Binary files /dev/null and b/delivery_carrier_warehouse/static/description/icon.png differ diff --git a/delivery_carrier_warehouse/static/description/index.html b/delivery_carrier_warehouse/static/description/index.html new file mode 100644 index 0000000000..4b5489017d --- /dev/null +++ b/delivery_carrier_warehouse/static/description/index.html @@ -0,0 +1,433 @@ + + + + + + +Delivery Carrier Warehouse + + + +
+

Delivery Carrier Warehouse

+ + +

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

+

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

+ +
+

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
    • +
+
+
+

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

+

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

+
+
+
+ + diff --git a/delivery_carrier_warehouse/tests/__init__.py b/delivery_carrier_warehouse/tests/__init__.py new file mode 100644 index 0000000000..b1892af75f --- /dev/null +++ b/delivery_carrier_warehouse/tests/__init__.py @@ -0,0 +1 @@ +from . import test_delivery_carrier_warehouse diff --git a/delivery_carrier_warehouse/tests/test_delivery_carrier_warehouse.py b/delivery_carrier_warehouse/tests/test_delivery_carrier_warehouse.py new file mode 100644 index 0000000000..874719f2ff --- /dev/null +++ b/delivery_carrier_warehouse/tests/test_delivery_carrier_warehouse.py @@ -0,0 +1,39 @@ +# Copyright 2020 Camptocamp SA +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) +from odoo.tests.common import Form, SavepointCase + + +class TestSaleDeliveryCarrierPreference(SavepointCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True)) + ref = cls.env.ref + cls.partner = ref("base.res_partner_12") + cls.product = ref("product.product_product_20") + cls.free_delivery_carrier = ref("delivery.free_delivery_carrier") + cls.delivery_local_delivery = ref("delivery.delivery_local_delivery") + cls.warehouse = ref("stock.warehouse0") + cls.warehouse.delivery_carrier_id = cls.free_delivery_carrier + + @classmethod + def _create_sale_order(cls): + sale_form = Form(cls.env["sale.order"]) + sale_form.partner_id = cls.partner + with sale_form.order_line.new() as line_form: + line_form.product_id = cls.product + line_form.product_uom_qty = 2 + return sale_form.save() + + def test_warehouse_carrier(self): + order = self._create_sale_order() + self.assertEqual( + self.partner.property_delivery_carrier_id, self.delivery_local_delivery + ) + action = order.action_open_delivery_wizard() + default_carrier_id = action["context"]["default_carrier_id"] + self.assertEqual(default_carrier_id, self.delivery_local_delivery.id) + self.partner.property_delivery_carrier_id = False + action = order.action_open_delivery_wizard() + default_carrier_id = action["context"]["default_carrier_id"] + self.assertEqual(default_carrier_id, self.free_delivery_carrier.id) diff --git a/delivery_carrier_warehouse/views/stock_warehouse.xml b/delivery_carrier_warehouse/views/stock_warehouse.xml new file mode 100644 index 0000000000..6a7bd1ca6e --- /dev/null +++ b/delivery_carrier_warehouse/views/stock_warehouse.xml @@ -0,0 +1,16 @@ + + + + stock.warehouse.inherit + stock.warehouse + + + + + + + + diff --git a/setup/delivery_carrier_warehouse/odoo/addons/delivery_carrier_warehouse b/setup/delivery_carrier_warehouse/odoo/addons/delivery_carrier_warehouse new file mode 120000 index 0000000000..20f78ce8a2 --- /dev/null +++ b/setup/delivery_carrier_warehouse/odoo/addons/delivery_carrier_warehouse @@ -0,0 +1 @@ +../../../../delivery_carrier_warehouse \ No newline at end of file diff --git a/setup/delivery_carrier_warehouse/setup.py b/setup/delivery_carrier_warehouse/setup.py new file mode 100644 index 0000000000..28c57bb640 --- /dev/null +++ b/setup/delivery_carrier_warehouse/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)