From 09aa3f91fee71864622d4e2918a74b11e2633afe Mon Sep 17 00:00:00 2001 From: geomer198 Date: Sun, 6 Aug 2023 22:19:30 +0300 Subject: [PATCH 1/4] [ADD] sale_order_warehouse_from_delivery_carrier: Module added. [UPD] Update sale_order_warehouse_from_delivery_carrier.pot [BOT] post-merge updates --- .../README.rst | 97 ++++ .../__init__.py | 1 + .../__manifest__.py | 14 + ..._order_warehouse_from_delivery_carrier.pot | 34 ++ .../models/__init__.py | 2 + .../models/delivery_carrier.py | 11 + .../models/sale_order.py | 19 + .../readme/CONFIGURE.rst | 3 + .../readme/CONTRIBUTORS.rst | 4 + .../readme/DESCRIPTION.rst | 1 + .../readme/USAGE.rst | 7 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 439 ++++++++++++++++++ .../tests/__init__.py | 1 + .../tests/test_module_flow.py | 88 ++++ .../views/delivery_carrier_views.xml | 15 + 16 files changed, 736 insertions(+) create mode 100644 sale_order_warehouse_from_delivery_carrier/README.rst create mode 100644 sale_order_warehouse_from_delivery_carrier/__init__.py create mode 100644 sale_order_warehouse_from_delivery_carrier/__manifest__.py create mode 100644 sale_order_warehouse_from_delivery_carrier/i18n/sale_order_warehouse_from_delivery_carrier.pot create mode 100644 sale_order_warehouse_from_delivery_carrier/models/__init__.py create mode 100644 sale_order_warehouse_from_delivery_carrier/models/delivery_carrier.py create mode 100644 sale_order_warehouse_from_delivery_carrier/models/sale_order.py create mode 100644 sale_order_warehouse_from_delivery_carrier/readme/CONFIGURE.rst create mode 100644 sale_order_warehouse_from_delivery_carrier/readme/CONTRIBUTORS.rst create mode 100644 sale_order_warehouse_from_delivery_carrier/readme/DESCRIPTION.rst create mode 100644 sale_order_warehouse_from_delivery_carrier/readme/USAGE.rst create mode 100644 sale_order_warehouse_from_delivery_carrier/static/description/icon.png create mode 100644 sale_order_warehouse_from_delivery_carrier/static/description/index.html create mode 100644 sale_order_warehouse_from_delivery_carrier/tests/__init__.py create mode 100644 sale_order_warehouse_from_delivery_carrier/tests/test_module_flow.py create mode 100644 sale_order_warehouse_from_delivery_carrier/views/delivery_carrier_views.xml diff --git a/sale_order_warehouse_from_delivery_carrier/README.rst b/sale_order_warehouse_from_delivery_carrier/README.rst new file mode 100644 index 0000000000..266d6cbf76 --- /dev/null +++ b/sale_order_warehouse_from_delivery_carrier/README.rst @@ -0,0 +1,97 @@ +========================================== +Sale Order Warehouse from Delivery Carrier +========================================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:e8f481a264c8661719b37031c573b70ab66023d43f2744604bc29f6b6a07a10c + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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/sale_order_warehouse_from_delivery_carrier + :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-sale_order_warehouse_from_delivery_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/delivery-carrier&target_branch=16.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows to set warehouse in Sales Order based on selected shipping method. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +Go to `Sales` -> `Settings` -> `Shipping methods` and select a shipping method + +Set warehouse in the "Sales Order Warehouse" field. + +Usage +===== + +Create a new quotation and select a shipping method. + +If selected shipping method has a sales order warehouse defined +this warehouse will be automatically set in the quotation. + +**Note**: +The warehouse will NOT be updated if the sales order is already confirmed. + +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 +~~~~~~~ + +* Cetmix + +Contributors +~~~~~~~~~~~~ + +* Cetmix + + * Ivan Sokolov + * Maksim Shurupov + +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/sale_order_warehouse_from_delivery_carrier/__init__.py b/sale_order_warehouse_from_delivery_carrier/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/sale_order_warehouse_from_delivery_carrier/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/sale_order_warehouse_from_delivery_carrier/__manifest__.py b/sale_order_warehouse_from_delivery_carrier/__manifest__.py new file mode 100644 index 0000000000..937d736026 --- /dev/null +++ b/sale_order_warehouse_from_delivery_carrier/__manifest__.py @@ -0,0 +1,14 @@ +{ + "name": "Sale Order Warehouse from Delivery Carrier", + "version": "16.0.1.0.0", + "category": "Delivery", + "summary": "Sale Order WH from Delivery Carrier", + "depends": ["sale_stock", "delivery"], + "website": "https://github.com/OCA/delivery-carrier", + "author": "Cetmix, Odoo Community Association (OCA)", + "data": [ + "views/delivery_carrier_views.xml", + ], + "installable": True, + "license": "AGPL-3", +} diff --git a/sale_order_warehouse_from_delivery_carrier/i18n/sale_order_warehouse_from_delivery_carrier.pot b/sale_order_warehouse_from_delivery_carrier/i18n/sale_order_warehouse_from_delivery_carrier.pot new file mode 100644 index 0000000000..dc337d1ff1 --- /dev/null +++ b/sale_order_warehouse_from_delivery_carrier/i18n/sale_order_warehouse_from_delivery_carrier.pot @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_order_warehouse_from_delivery_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: sale_order_warehouse_from_delivery_carrier +#: model:ir.model.fields,help:sale_order_warehouse_from_delivery_carrier.field_delivery_carrier__so_warehouse_id +msgid "Default warehouse for the sales order that uses this delivery carrier" +msgstr "" + +#. module: sale_order_warehouse_from_delivery_carrier +#: model:ir.model,name:sale_order_warehouse_from_delivery_carrier.model_sale_order +msgid "Sales Order" +msgstr "" + +#. module: sale_order_warehouse_from_delivery_carrier +#: model:ir.model.fields,field_description:sale_order_warehouse_from_delivery_carrier.field_delivery_carrier__so_warehouse_id +msgid "Sales Order Warehouse" +msgstr "" + +#. module: sale_order_warehouse_from_delivery_carrier +#: model:ir.model,name:sale_order_warehouse_from_delivery_carrier.model_delivery_carrier +msgid "Shipping Methods" +msgstr "" diff --git a/sale_order_warehouse_from_delivery_carrier/models/__init__.py b/sale_order_warehouse_from_delivery_carrier/models/__init__.py new file mode 100644 index 0000000000..e5fe558510 --- /dev/null +++ b/sale_order_warehouse_from_delivery_carrier/models/__init__.py @@ -0,0 +1,2 @@ +from . import delivery_carrier +from . import sale_order diff --git a/sale_order_warehouse_from_delivery_carrier/models/delivery_carrier.py b/sale_order_warehouse_from_delivery_carrier/models/delivery_carrier.py new file mode 100644 index 0000000000..9e7021bcfa --- /dev/null +++ b/sale_order_warehouse_from_delivery_carrier/models/delivery_carrier.py @@ -0,0 +1,11 @@ +from odoo import fields, models + + +class DeliveryCarrier(models.Model): + _inherit = "delivery.carrier" + + so_warehouse_id = fields.Many2one( + comodel_name="stock.warehouse", + string="Sales Order Warehouse", + help="Default warehouse for the sales order that uses this delivery carrier", + ) diff --git a/sale_order_warehouse_from_delivery_carrier/models/sale_order.py b/sale_order_warehouse_from_delivery_carrier/models/sale_order.py new file mode 100644 index 0000000000..a65193a49d --- /dev/null +++ b/sale_order_warehouse_from_delivery_carrier/models/sale_order.py @@ -0,0 +1,19 @@ +from odoo import api, models + + +class SaleOrder(models.Model): + _inherit = "sale.order" + + @api.depends("user_id", "company_id", "carrier_id") + def _compute_warehouse_id(self): + # Set warehouse by shipping method + so_with_shipping = self.browse() + for order in self: + if ( + order.state == "draft" + and order.carrier_id + and order.carrier_id.so_warehouse_id + ): + order.warehouse_id = order.carrier_id.so_warehouse_id + so_with_shipping |= order + return super(SaleOrder, self - so_with_shipping)._compute_warehouse_id() diff --git a/sale_order_warehouse_from_delivery_carrier/readme/CONFIGURE.rst b/sale_order_warehouse_from_delivery_carrier/readme/CONFIGURE.rst new file mode 100644 index 0000000000..ddd6cda3fe --- /dev/null +++ b/sale_order_warehouse_from_delivery_carrier/readme/CONFIGURE.rst @@ -0,0 +1,3 @@ +Go to `Sales` -> `Settings` -> `Shipping methods` and select a shipping method + +Set warehouse in the "Sales Order Warehouse" field. diff --git a/sale_order_warehouse_from_delivery_carrier/readme/CONTRIBUTORS.rst b/sale_order_warehouse_from_delivery_carrier/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..3336c877aa --- /dev/null +++ b/sale_order_warehouse_from_delivery_carrier/readme/CONTRIBUTORS.rst @@ -0,0 +1,4 @@ +* Cetmix + + * Ivan Sokolov + * Maksim Shurupov diff --git a/sale_order_warehouse_from_delivery_carrier/readme/DESCRIPTION.rst b/sale_order_warehouse_from_delivery_carrier/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..6a4e4182c9 --- /dev/null +++ b/sale_order_warehouse_from_delivery_carrier/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module allows to set warehouse in Sales Order based on selected shipping method. diff --git a/sale_order_warehouse_from_delivery_carrier/readme/USAGE.rst b/sale_order_warehouse_from_delivery_carrier/readme/USAGE.rst new file mode 100644 index 0000000000..f5a33d727c --- /dev/null +++ b/sale_order_warehouse_from_delivery_carrier/readme/USAGE.rst @@ -0,0 +1,7 @@ +Create a new quotation and select a shipping method. + +If selected shipping method has a sales order warehouse defined +this warehouse will be automatically set in the quotation. + +**Note**: +The warehouse will NOT be updated if the sales order is already confirmed. diff --git a/sale_order_warehouse_from_delivery_carrier/static/description/icon.png b/sale_order_warehouse_from_delivery_carrier/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/sale_order_warehouse_from_delivery_carrier/static/description/index.html b/sale_order_warehouse_from_delivery_carrier/static/description/index.html new file mode 100644 index 0000000000..01b37f5596 --- /dev/null +++ b/sale_order_warehouse_from_delivery_carrier/static/description/index.html @@ -0,0 +1,439 @@ + + + + + +Sale Order Warehouse from Delivery Carrier + + + +
+

Sale Order Warehouse from Delivery Carrier

+ + +

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

+

This module allows to set warehouse in Sales Order based on selected shipping method.

+

Table of contents

+ +
+

Configuration

+

Go to Sales -> Settings -> Shipping methods and select a shipping method

+

Set warehouse in the “Sales Order Warehouse” field.

+
+
+

Usage

+

Create a new quotation and select a shipping method.

+

If selected shipping method has a sales order warehouse defined +this warehouse will be automatically set in the quotation.

+

Note: +The warehouse will NOT be updated if the sales order is already confirmed.

+
+
+

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

+
    +
  • Cetmix
    • +
+
+
+

Contributors

+
    +
  • Cetmix <cetmix.com>
      +
    • Ivan Sokolov
      • +
    • Maksim Shurupov
      • +
    +
    • +
+
+
+

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/sale_order_warehouse_from_delivery_carrier/tests/__init__.py b/sale_order_warehouse_from_delivery_carrier/tests/__init__.py new file mode 100644 index 0000000000..9f0ab2bf10 --- /dev/null +++ b/sale_order_warehouse_from_delivery_carrier/tests/__init__.py @@ -0,0 +1 @@ +from . import test_module_flow diff --git a/sale_order_warehouse_from_delivery_carrier/tests/test_module_flow.py b/sale_order_warehouse_from_delivery_carrier/tests/test_module_flow.py new file mode 100644 index 0000000000..014d8240b7 --- /dev/null +++ b/sale_order_warehouse_from_delivery_carrier/tests/test_module_flow.py @@ -0,0 +1,88 @@ +from odoo.tests import Form, TransactionCase, tagged + + +@tagged("post_install", "-at_install") +class TestModuleFlow(TransactionCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.local_delivery = cls.env.ref( + "delivery.delivery_local_delivery", raise_if_not_found=False + ) + cls.poste_delivery = cls.env.ref( + "delivery.delivery_carrier", raise_if_not_found=False + ) + cls.warehouse0 = cls.env["stock.warehouse"].create( + { + "name": "Test Warehouse #1", + "code": "TWH-1", + } + ) + cls.warehouse1 = cls.env["stock.warehouse"].create( + { + "name": "Test Warehouse #2", + "code": "TWH-2", + } + ) + cls.local_delivery.write({"so_warehouse_id": cls.warehouse0.id}) + cls.poste_delivery.write({"so_warehouse_id": cls.warehouse1.id}) + cls.saleperson_warehouse = cls.env.user._get_default_warehouse_id() + + form = Form( + cls.env["sale.order"], + ) + form.partner_id = cls.env.ref("base.res_partner_2", raise_if_not_found=False) + with form.order_line.new() as line: + line.product_id = cls.env.ref( + "product.product_product_25", raise_if_not_found=False + ) + cls.sale_order = form.save() + + def _set_shipping_method(self, delivery_method): + form = Form( + self.env["choose.delivery.carrier"].with_context( + default_order_id=self.sale_order.id, + ), + view="delivery.choose_delivery_carrier_view_form", + ) + form.carrier_id = delivery_method + shipping = form.save() + shipping.button_confirm() + + def test_sale_order_warehouse_default(self): + """Test flow when set order warehouse by default""" + self.assertEqual( + self.saleperson_warehouse, + self.sale_order.warehouse_id, + msg="Order Warehouse must be equal to saleperson default warehouse", + ) + + def test_sale_order_warehouse_custom(self): + """Test flow when set order warehouse by 'Shipping Method' record""" + self._set_shipping_method(self.local_delivery) + self.assertEqual( + self.warehouse0, + self.sale_order.warehouse_id, + msg="Order Warehouse must be equal to 'Test Warehouse #1'", + ) + + def test_sale_order_carrier_id_confirmation(self): + """Test flow when change 'Shipping Method' after confirmation""" + self._set_shipping_method(self.local_delivery) + self.assertEqual( + self.sale_order.warehouse_id.id, + self.warehouse0.id, + msg="Order Warehouse must be equal to 'Test Warehouse #1'", + ) + self.sale_order.action_confirm() + self._set_shipping_method(self.poste_delivery) + self.assertNotEqual( + self.sale_order.warehouse_id.id, + self.warehouse1.id, + msg="Order Warehouse must not be equal to 'Test Warehouse #2'", + ) + self.assertEqual( + self.sale_order.warehouse_id.id, + self.warehouse0.id, + msg="Order Warehouse must be equal to 'Test Warehouse #1'", + ) diff --git a/sale_order_warehouse_from_delivery_carrier/views/delivery_carrier_views.xml b/sale_order_warehouse_from_delivery_carrier/views/delivery_carrier_views.xml new file mode 100644 index 0000000000..634fd926cb --- /dev/null +++ b/sale_order_warehouse_from_delivery_carrier/views/delivery_carrier_views.xml @@ -0,0 +1,15 @@ + + + + + delivery.carrier.so.warehouse.form + delivery.carrier + + + + + + + + + From 89b3d588e8f9ca388c2fecc4c59b1bfb193b2cf0 Mon Sep 17 00:00:00 2001 From: mymage Date: Tue, 30 Jul 2024 14:38:31 +0000 Subject: [PATCH 2/4] Added translation using Weblate (Italian) Translated using Weblate (Italian) Currently translated at 100.0% (4 of 4 strings) Translation: delivery-carrier-16.0/delivery-carrier-16.0-sale_order_warehouse_from_delivery_carrier Translate-URL: https://translation.odoo-community.org/projects/delivery-carrier-16-0/delivery-carrier-16-0-sale_order_warehouse_from_delivery_carrier/it/ --- .../i18n/it.po | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 sale_order_warehouse_from_delivery_carrier/i18n/it.po diff --git a/sale_order_warehouse_from_delivery_carrier/i18n/it.po b/sale_order_warehouse_from_delivery_carrier/i18n/it.po new file mode 100644 index 0000000000..e2949d1165 --- /dev/null +++ b/sale_order_warehouse_from_delivery_carrier/i18n/it.po @@ -0,0 +1,38 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_order_warehouse_from_delivery_carrier +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2024-07-30 16:58+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 5.6.2\n" + +#. module: sale_order_warehouse_from_delivery_carrier +#: model:ir.model.fields,help:sale_order_warehouse_from_delivery_carrier.field_delivery_carrier__so_warehouse_id +msgid "Default warehouse for the sales order that uses this delivery carrier" +msgstr "" +"Il magazzino predefinito per gli ordini di vendita che usano questo corriere" + +#. module: sale_order_warehouse_from_delivery_carrier +#: model:ir.model,name:sale_order_warehouse_from_delivery_carrier.model_sale_order +msgid "Sales Order" +msgstr "Ordine di vendita" + +#. module: sale_order_warehouse_from_delivery_carrier +#: model:ir.model.fields,field_description:sale_order_warehouse_from_delivery_carrier.field_delivery_carrier__so_warehouse_id +msgid "Sales Order Warehouse" +msgstr "Magazzino ordine di vendita" + +#. module: sale_order_warehouse_from_delivery_carrier +#: model:ir.model,name:sale_order_warehouse_from_delivery_carrier.model_delivery_carrier +msgid "Shipping Methods" +msgstr "Metodi di spedizione" From 4232654020c3a3507f66b59c78256cf5c92e5782 Mon Sep 17 00:00:00 2001 From: Sander Lienaerts Date: Tue, 6 Aug 2024 08:31:44 +0200 Subject: [PATCH 3/4] [IMP] sale_order_warehouse_from_delivery_carrier: black, isort, prettier --- .../README.rst | 35 ++++++++++--------- .../pyproject.toml | 3 ++ .../readme/CONFIGURE.md | 4 +++ .../readme/CONFIGURE.rst | 3 -- .../readme/CONTRIBUTORS.md | 3 ++ .../readme/CONTRIBUTORS.rst | 4 --- .../{DESCRIPTION.rst => DESCRIPTION.md} | 3 +- .../readme/USAGE.md | 7 ++++ .../readme/USAGE.rst | 7 ---- .../static/description/index.html | 30 +++++++++------- 10 files changed, 54 insertions(+), 45 deletions(-) create mode 100644 sale_order_warehouse_from_delivery_carrier/pyproject.toml create mode 100644 sale_order_warehouse_from_delivery_carrier/readme/CONFIGURE.md delete mode 100644 sale_order_warehouse_from_delivery_carrier/readme/CONFIGURE.rst create mode 100644 sale_order_warehouse_from_delivery_carrier/readme/CONTRIBUTORS.md delete mode 100644 sale_order_warehouse_from_delivery_carrier/readme/CONTRIBUTORS.rst rename sale_order_warehouse_from_delivery_carrier/readme/{DESCRIPTION.rst => DESCRIPTION.md} (74%) create mode 100644 sale_order_warehouse_from_delivery_carrier/readme/USAGE.md delete mode 100644 sale_order_warehouse_from_delivery_carrier/readme/USAGE.rst diff --git a/sale_order_warehouse_from_delivery_carrier/README.rst b/sale_order_warehouse_from_delivery_carrier/README.rst index 266d6cbf76..5a5b59d3fc 100644 --- a/sale_order_warehouse_from_delivery_carrier/README.rst +++ b/sale_order_warehouse_from_delivery_carrier/README.rst @@ -17,18 +17,19 @@ Sale Order Warehouse from Delivery Carrier :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/sale_order_warehouse_from_delivery_carrier + :target: https://github.com/OCA/delivery-carrier/tree/17.0/sale_order_warehouse_from_delivery_carrier :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-sale_order_warehouse_from_delivery_carrier + :target: https://translation.odoo-community.org/projects/delivery-carrier-17-0/delivery-carrier-17-0-sale_order_warehouse_from_delivery_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/delivery-carrier&target_branch=16.0 + :target: https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&target_branch=17.0 :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| -This module allows to set warehouse in Sales Order based on selected shipping method. +This module allows to set warehouse in Sales Order based on selected +shipping method. **Table of contents** @@ -38,7 +39,7 @@ This module allows to set warehouse in Sales Order based on selected shipping me Configuration ============= -Go to `Sales` -> `Settings` -> `Shipping methods` and select a shipping method +Go to Sales -> Settings -> Shipping methods and select a shipping method Set warehouse in the "Sales Order Warehouse" field. @@ -47,11 +48,11 @@ Usage Create a new quotation and select a shipping method. -If selected shipping method has a sales order warehouse defined -this warehouse will be automatically set in the quotation. +If selected shipping method has a sales order warehouse defined this +warehouse will be automatically set in the quotation. -**Note**: -The warehouse will NOT be updated if the sales order is already confirmed. +**Note**: The warehouse will NOT be updated if the sales order is +already confirmed. Bug Tracker =========== @@ -59,7 +60,7 @@ 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -67,20 +68,20 @@ Credits ======= Authors -~~~~~~~ +------- * Cetmix Contributors -~~~~~~~~~~~~ +------------ -* Cetmix +- Cetmix - * Ivan Sokolov - * Maksim Shurupov + - Ivan Sokolov + - Maksim Shurupov Maintainers -~~~~~~~~~~~ +----------- This module is maintained by the OCA. @@ -92,6 +93,6 @@ 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. +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/sale_order_warehouse_from_delivery_carrier/pyproject.toml b/sale_order_warehouse_from_delivery_carrier/pyproject.toml new file mode 100644 index 0000000000..4231d0cccb --- /dev/null +++ b/sale_order_warehouse_from_delivery_carrier/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" diff --git a/sale_order_warehouse_from_delivery_carrier/readme/CONFIGURE.md b/sale_order_warehouse_from_delivery_carrier/readme/CONFIGURE.md new file mode 100644 index 0000000000..a97cf8cfda --- /dev/null +++ b/sale_order_warehouse_from_delivery_carrier/readme/CONFIGURE.md @@ -0,0 +1,4 @@ +Go to Sales -\> Settings -\> Shipping methods and select a shipping +method + +Set warehouse in the "Sales Order Warehouse" field. diff --git a/sale_order_warehouse_from_delivery_carrier/readme/CONFIGURE.rst b/sale_order_warehouse_from_delivery_carrier/readme/CONFIGURE.rst deleted file mode 100644 index ddd6cda3fe..0000000000 --- a/sale_order_warehouse_from_delivery_carrier/readme/CONFIGURE.rst +++ /dev/null @@ -1,3 +0,0 @@ -Go to `Sales` -> `Settings` -> `Shipping methods` and select a shipping method - -Set warehouse in the "Sales Order Warehouse" field. diff --git a/sale_order_warehouse_from_delivery_carrier/readme/CONTRIBUTORS.md b/sale_order_warehouse_from_delivery_carrier/readme/CONTRIBUTORS.md new file mode 100644 index 0000000000..3734eba577 --- /dev/null +++ b/sale_order_warehouse_from_delivery_carrier/readme/CONTRIBUTORS.md @@ -0,0 +1,3 @@ +- Cetmix \ + - Ivan Sokolov + - Maksim Shurupov diff --git a/sale_order_warehouse_from_delivery_carrier/readme/CONTRIBUTORS.rst b/sale_order_warehouse_from_delivery_carrier/readme/CONTRIBUTORS.rst deleted file mode 100644 index 3336c877aa..0000000000 --- a/sale_order_warehouse_from_delivery_carrier/readme/CONTRIBUTORS.rst +++ /dev/null @@ -1,4 +0,0 @@ -* Cetmix - - * Ivan Sokolov - * Maksim Shurupov diff --git a/sale_order_warehouse_from_delivery_carrier/readme/DESCRIPTION.rst b/sale_order_warehouse_from_delivery_carrier/readme/DESCRIPTION.md similarity index 74% rename from sale_order_warehouse_from_delivery_carrier/readme/DESCRIPTION.rst rename to sale_order_warehouse_from_delivery_carrier/readme/DESCRIPTION.md index 6a4e4182c9..e8ae1dc6d7 100644 --- a/sale_order_warehouse_from_delivery_carrier/readme/DESCRIPTION.rst +++ b/sale_order_warehouse_from_delivery_carrier/readme/DESCRIPTION.md @@ -1 +1,2 @@ -This module allows to set warehouse in Sales Order based on selected shipping method. +This module allows to set warehouse in Sales Order based on selected +shipping method. diff --git a/sale_order_warehouse_from_delivery_carrier/readme/USAGE.md b/sale_order_warehouse_from_delivery_carrier/readme/USAGE.md new file mode 100644 index 0000000000..a8e782346c --- /dev/null +++ b/sale_order_warehouse_from_delivery_carrier/readme/USAGE.md @@ -0,0 +1,7 @@ +Create a new quotation and select a shipping method. + +If selected shipping method has a sales order warehouse defined this +warehouse will be automatically set in the quotation. + +**Note**: The warehouse will NOT be updated if the sales order is +already confirmed. diff --git a/sale_order_warehouse_from_delivery_carrier/readme/USAGE.rst b/sale_order_warehouse_from_delivery_carrier/readme/USAGE.rst deleted file mode 100644 index f5a33d727c..0000000000 --- a/sale_order_warehouse_from_delivery_carrier/readme/USAGE.rst +++ /dev/null @@ -1,7 +0,0 @@ -Create a new quotation and select a shipping method. - -If selected shipping method has a sales order warehouse defined -this warehouse will be automatically set in the quotation. - -**Note**: -The warehouse will NOT be updated if the sales order is already confirmed. diff --git a/sale_order_warehouse_from_delivery_carrier/static/description/index.html b/sale_order_warehouse_from_delivery_carrier/static/description/index.html index 01b37f5596..fb0cd46bf8 100644 --- a/sale_order_warehouse_from_delivery_carrier/static/description/index.html +++ b/sale_order_warehouse_from_delivery_carrier/static/description/index.html @@ -8,10 +8,11 @@ /* :Author: David Goodger (goodger@python.org) -:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ +:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $ :Copyright: This stylesheet has been placed in the public domain. Default cascading style sheet for the HTML output of Docutils. +Despite the name, some widely supported CSS2 features are used. See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to customize this style sheet. @@ -274,7 +275,7 @@ margin-left: 2em ; margin-right: 2em } -pre.code .ln { color: grey; } /* line numbers */ +pre.code .ln { color: gray; } /* line numbers */ pre.code, code { background-color: #eeeeee } pre.code .comment, code .comment { color: #5C6576 } pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } @@ -300,7 +301,7 @@ span.pre { white-space: pre } -span.problematic { +span.problematic, pre.problematic { color: red } span.section-subtitle { @@ -368,8 +369,9 @@

Sale Order Warehouse from Delivery Carrier

!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! source digest: sha256:e8f481a264c8661719b37031c573b70ab66023d43f2744604bc29f6b6a07a10c !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

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

-

This module allows to set warehouse in Sales Order based on selected shipping method.

+

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

+

This module allows to set warehouse in Sales Order based on selected +shipping method.

Table of contents

    @@ -386,23 +388,23 @@

    Sale Order Warehouse from Delivery Carrier

Configuration

-

Go to Sales -> Settings -> Shipping methods and select a shipping method

+

Go to Sales -> Settings -> Shipping methods and select a shipping method

Set warehouse in the “Sales Order Warehouse” field.

Usage

Create a new quotation and select a shipping method.

-

If selected shipping method has a sales order warehouse defined -this warehouse will be automatically set in the quotation.

-

Note: -The warehouse will NOT be updated if the sales order is already confirmed.

+

If selected shipping method has a sales order warehouse defined this +warehouse will be automatically set in the quotation.

+

Note: The warehouse will NOT be updated if the sales order is +already confirmed.

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.

+feedback.

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

@@ -426,11 +428,13 @@

Contributors

Maintainers

This module is maintained by the OCA.

-Odoo Community Association + +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.

+

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.

From 2082f76aba67ff4d2b7f2d924fc5a06b34fc4372 Mon Sep 17 00:00:00 2001 From: Sander Lienaerts Date: Tue, 6 Aug 2024 09:14:50 +0200 Subject: [PATCH 4/4] [MIG] sale_order_warehouse_from_delivery_carrier: Migration to 17.0 --- .../README.rst | 6 +++- .../__manifest__.py | 2 +- .../i18n/nl.po | 36 +++++++++++++++++++ .../readme/CONTRIBUTORS.md | 2 ++ .../static/description/index.html | 17 ++++----- .../views/delivery_carrier_views.xml | 2 +- 6 files changed, 54 insertions(+), 11 deletions(-) create mode 100644 sale_order_warehouse_from_delivery_carrier/i18n/nl.po diff --git a/sale_order_warehouse_from_delivery_carrier/README.rst b/sale_order_warehouse_from_delivery_carrier/README.rst index 5a5b59d3fc..3c68e5c8c0 100644 --- a/sale_order_warehouse_from_delivery_carrier/README.rst +++ b/sale_order_warehouse_from_delivery_carrier/README.rst @@ -7,7 +7,7 @@ Sale Order Warehouse from Delivery Carrier !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:e8f481a264c8661719b37031c573b70ab66023d43f2744604bc29f6b6a07a10c + !! source digest: sha256:31d3be7a7aeddf2a3958be40ec29b0f17389652da8bcf1460e6e3369346624a7 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png @@ -80,6 +80,10 @@ Contributors - Ivan Sokolov - Maksim Shurupov +- Codeforward (https://www.codeforward.nl): + + - Sander Lienaerts sander.lienaerts@codeforward.nl + Maintainers ----------- diff --git a/sale_order_warehouse_from_delivery_carrier/__manifest__.py b/sale_order_warehouse_from_delivery_carrier/__manifest__.py index 937d736026..411eabcf41 100644 --- a/sale_order_warehouse_from_delivery_carrier/__manifest__.py +++ b/sale_order_warehouse_from_delivery_carrier/__manifest__.py @@ -1,6 +1,6 @@ { "name": "Sale Order Warehouse from Delivery Carrier", - "version": "16.0.1.0.0", + "version": "17.0.1.0.0", "category": "Delivery", "summary": "Sale Order WH from Delivery Carrier", "depends": ["sale_stock", "delivery"], diff --git a/sale_order_warehouse_from_delivery_carrier/i18n/nl.po b/sale_order_warehouse_from_delivery_carrier/i18n/nl.po new file mode 100644 index 0000000000..f31bd19563 --- /dev/null +++ b/sale_order_warehouse_from_delivery_carrier/i18n/nl.po @@ -0,0 +1,36 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_order_warehouse_from_delivery_carrier +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 17.0+e\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2024-08-06 07:52+0000\n" +"PO-Revision-Date: 2024-08-06 07:52+0000\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: sale_order_warehouse_from_delivery_carrier +#: model:ir.model.fields,help:sale_order_warehouse_from_delivery_carrier.field_delivery_carrier__so_warehouse_id +msgid "Default warehouse for the sales order that uses this delivery carrier" +msgstr "Standaard magazijn voor de verkooporder die deze verzendwijze gebruikt" + +#. module: sale_order_warehouse_from_delivery_carrier +#: model:ir.model,name:sale_order_warehouse_from_delivery_carrier.model_sale_order +msgid "Sales Order" +msgstr "Verkooporder" + +#. module: sale_order_warehouse_from_delivery_carrier +#: model:ir.model.fields,field_description:sale_order_warehouse_from_delivery_carrier.field_delivery_carrier__so_warehouse_id +msgid "Sales Order Warehouse" +msgstr "Verkooporder magazijn" + +#. module: sale_order_warehouse_from_delivery_carrier +#: model:ir.model,name:sale_order_warehouse_from_delivery_carrier.model_delivery_carrier +msgid "Shipping Methods" +msgstr "Verzendwijzes" diff --git a/sale_order_warehouse_from_delivery_carrier/readme/CONTRIBUTORS.md b/sale_order_warehouse_from_delivery_carrier/readme/CONTRIBUTORS.md index 3734eba577..2cbc3bc87a 100644 --- a/sale_order_warehouse_from_delivery_carrier/readme/CONTRIBUTORS.md +++ b/sale_order_warehouse_from_delivery_carrier/readme/CONTRIBUTORS.md @@ -1,3 +1,5 @@ - Cetmix \ - Ivan Sokolov - Maksim Shurupov +- Codeforward (https://www.codeforward.nl): + - Sander Lienaerts diff --git a/sale_order_warehouse_from_delivery_carrier/static/description/index.html b/sale_order_warehouse_from_delivery_carrier/static/description/index.html index fb0cd46bf8..25e602cdba 100644 --- a/sale_order_warehouse_from_delivery_carrier/static/description/index.html +++ b/sale_order_warehouse_from_delivery_carrier/static/description/index.html @@ -8,11 +8,10 @@ /* :Author: David Goodger (goodger@python.org) -:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $ +:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ :Copyright: This stylesheet has been placed in the public domain. Default cascading style sheet for the HTML output of Docutils. -Despite the name, some widely supported CSS2 features are used. See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to customize this style sheet. @@ -275,7 +274,7 @@ margin-left: 2em ; margin-right: 2em } -pre.code .ln { color: gray; } /* line numbers */ +pre.code .ln { color: grey; } /* line numbers */ pre.code, code { background-color: #eeeeee } pre.code .comment, code .comment { color: #5C6576 } pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } @@ -301,7 +300,7 @@ span.pre { white-space: pre } -span.problematic, pre.problematic { +span.problematic { color: red } span.section-subtitle { @@ -367,7 +366,7 @@

Sale Order Warehouse from Delivery Carrier

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:e8f481a264c8661719b37031c573b70ab66023d43f2744604bc29f6b6a07a10c +!! source digest: sha256:31d3be7a7aeddf2a3958be40ec29b0f17389652da8bcf1460e6e3369346624a7 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

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

This module allows to set warehouse in Sales Order based on selected @@ -423,14 +422,16 @@

Contributors

  • Maksim Shurupov
    • +
  • Codeforward (https://www.codeforward.nl): +

    • Maintainers

    This module is maintained by the OCA.

    - -Odoo Community Association - +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.

    diff --git a/sale_order_warehouse_from_delivery_carrier/views/delivery_carrier_views.xml b/sale_order_warehouse_from_delivery_carrier/views/delivery_carrier_views.xml index 634fd926cb..b85645bf6c 100644 --- a/sale_order_warehouse_from_delivery_carrier/views/delivery_carrier_views.xml +++ b/sale_order_warehouse_from_delivery_carrier/views/delivery_carrier_views.xml @@ -6,7 +6,7 @@ delivery.carrier - +