From 279ad262883d1b88da9984b173d19a1516da183b Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Tue, 8 Jun 2021 11:07:31 +0200 Subject: [PATCH 01/11] delivery_carrier_agency [UPD] Update delivery_carrier_agency.pot [UPD] README.rst [ADD] icon.png --- delivery_carrier_agency/README.rst | 76 ++++ delivery_carrier_agency/__init__.py | 1 + delivery_carrier_agency/__manifest__.py | 23 + .../i18n/delivery_carrier_agency.pot | 112 +++++ delivery_carrier_agency/models/__init__.py | 2 + .../models/delivery_carrier_agency.py | 33 ++ .../models/stock_picking.py | 25 ++ .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 4 + .../security/ir.model.access.csv | 3 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 422 ++++++++++++++++++ delivery_carrier_agency/tests/__init__.py | 1 + .../tests/test_carrier_agency.py | 43 ++ .../views/delivery_carrier_agency_view.xml | 56 +++ 15 files changed, 802 insertions(+) create mode 100644 delivery_carrier_agency/README.rst create mode 100644 delivery_carrier_agency/__init__.py create mode 100644 delivery_carrier_agency/__manifest__.py create mode 100644 delivery_carrier_agency/i18n/delivery_carrier_agency.pot create mode 100644 delivery_carrier_agency/models/__init__.py create mode 100644 delivery_carrier_agency/models/delivery_carrier_agency.py create mode 100644 delivery_carrier_agency/models/stock_picking.py create mode 100644 delivery_carrier_agency/readme/CONTRIBUTORS.rst create mode 100644 delivery_carrier_agency/readme/DESCRIPTION.rst create mode 100644 delivery_carrier_agency/security/ir.model.access.csv create mode 100644 delivery_carrier_agency/static/description/icon.png create mode 100644 delivery_carrier_agency/static/description/index.html create mode 100644 delivery_carrier_agency/tests/__init__.py create mode 100644 delivery_carrier_agency/tests/test_carrier_agency.py create mode 100644 delivery_carrier_agency/views/delivery_carrier_agency_view.xml diff --git a/delivery_carrier_agency/README.rst b/delivery_carrier_agency/README.rst new file mode 100644 index 0000000000..827c4ebb6e --- /dev/null +++ b/delivery_carrier_agency/README.rst @@ -0,0 +1,76 @@ +======================= +Delivery Carrier Agency +======================= + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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/14.0/delivery_carrier_agency + :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-14-0/delivery-carrier-14-0-delivery_carrier_agency + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/99/14.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +Add carrier agency concept +A delivery carrier may have one or mutliple agencies. +The module does not add any logic around these agencies, it will be done in dedicated carrier modules if necessary. +For instance, when generating label, sometimes, some information may depend on the agency that will receive the package, which may depend on the warehouse + +**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 smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Akretion + +Contributors +~~~~~~~~~~~~ + +* Florian da Costa + +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/delivery_carrier_agency/__init__.py b/delivery_carrier_agency/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/delivery_carrier_agency/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/delivery_carrier_agency/__manifest__.py b/delivery_carrier_agency/__manifest__.py new file mode 100644 index 0000000000..c7f2fe301f --- /dev/null +++ b/delivery_carrier_agency/__manifest__.py @@ -0,0 +1,23 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + + +{ + "name": "Delivery Carrier Agency", + "summary": "Add a model for Carrier Agencies", + "version": "14.0.1.0.1", + "category": "Delivery", + "website": "https://github.com/OCA/delivery-carrier", + "author": "Akretion,Odoo Community Association (OCA)", + "license": "AGPL-3", + "application": False, + "installable": True, + "depends": [ + "delivery", + ], + "data": [ + "security/ir.model.access.csv", + "views/delivery_carrier_agency_view.xml", + ], + "demo": [], + "qweb": [], +} diff --git a/delivery_carrier_agency/i18n/delivery_carrier_agency.pot b/delivery_carrier_agency/i18n/delivery_carrier_agency.pot new file mode 100644 index 0000000000..a9b0446a73 --- /dev/null +++ b/delivery_carrier_agency/i18n/delivery_carrier_agency.pot @@ -0,0 +1,112 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * delivery_carrier_agency +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.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_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__partner_id +msgid "Address" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.actions.act_window,name:delivery_carrier_agency.action_carrier_agency +#: model:ir.model,name:delivery_carrier_agency.model_delivery_carrier_agency +#: model:ir.ui.menu,name:delivery_carrier_agency.carrier_agency_menu +msgid "Carrier Agency" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__carrier_ids +msgid "Carriers" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__create_uid +msgid "Created by" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__create_date +msgid "Created on" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__delivery_type +msgid "Delivery Type" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__display_name +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_stock_picking__display_name +msgid "Display Name" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__external_reference +msgid "External Reference" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__id +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_stock_picking__id +msgid "ID" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency____last_update +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_stock_picking____last_update +msgid "Last Modified on" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__write_uid +msgid "Last Updated by" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__write_date +msgid "Last Updated on" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__name +msgid "Name" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,help:delivery_carrier_agency.field_delivery_carrier_agency__external_reference +msgid "Reference or code supplied by the carrier" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__sequence +msgid "Sequence" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,help:delivery_carrier_agency.field_delivery_carrier_agency__carrier_ids +msgid "" +"This field may be used to link an account to specific delivery methods It " +"may be usefull to find an account with more precision than with only the " +"delivery type" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model,name:delivery_carrier_agency.model_stock_picking +msgid "Transfer" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__warehouse_ids +msgid "Warehouses" +msgstr "" diff --git a/delivery_carrier_agency/models/__init__.py b/delivery_carrier_agency/models/__init__.py new file mode 100644 index 0000000000..792558576a --- /dev/null +++ b/delivery_carrier_agency/models/__init__.py @@ -0,0 +1,2 @@ +from . import delivery_carrier_agency +from . import stock_picking diff --git a/delivery_carrier_agency/models/delivery_carrier_agency.py b/delivery_carrier_agency/models/delivery_carrier_agency.py new file mode 100644 index 0000000000..2e5c25d6b9 --- /dev/null +++ b/delivery_carrier_agency/models/delivery_carrier_agency.py @@ -0,0 +1,33 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class DeliveryCarrierAgency(models.Model): + _name = "delivery.carrier.agency" + _description = "Carrier Agency" + _order = "sequence, id" + + name = fields.Char(required=True) + external_reference = fields.Char(help="Reference or code supplied by the carrier") + delivery_type = fields.Selection( + selection=lambda self: self.env["delivery.carrier"] + ._fields["delivery_type"] + .selection, + required=True, + ) + carrier_ids = fields.Many2many( + "delivery.carrier", + "delivery_carrier_agency_rel", + "agency_id", + "carrier_id", + string="Carriers", + help=( + "This field may be used to link an account to specific delivery methods" + " It may be usefull to find an account with more precision than with " + "only the delivery type" + ), + ) + partner_id = fields.Many2one("res.partner", string="Address") + warehouse_ids = fields.Many2many("stock.warehouse", string="Warehouses") + sequence = fields.Integer() diff --git a/delivery_carrier_agency/models/stock_picking.py b/delivery_carrier_agency/models/stock_picking.py new file mode 100644 index 0000000000..e669116c1c --- /dev/null +++ b/delivery_carrier_agency/models/stock_picking.py @@ -0,0 +1,25 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import models + + +class StockPicking(models.Model): + _inherit = "stock.picking" + + def _get_domain_agency(self): + self.ensure_one() + wh = self.location_id.get_warehouse() + return [ + ("delivery_type", "=", self.carrier_id.delivery_type), + "|", + ("warehouse_ids", "=", False), + ("warehouse_ids", "in", wh.ids), + "|", + ("carrier_ids", "in", [self.carrier_id.id]), + ("carrier_ids", "=", False), + ] + + def _get_carrier_agency(self): + self.ensure_one() + domain = self._get_domain_agency() + return self.env["delivery.carrier.agency"].search(domain, limit=1) diff --git a/delivery_carrier_agency/readme/CONTRIBUTORS.rst b/delivery_carrier_agency/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..0bddb053ae --- /dev/null +++ b/delivery_carrier_agency/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Florian da Costa diff --git a/delivery_carrier_agency/readme/DESCRIPTION.rst b/delivery_carrier_agency/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..59b8b121f2 --- /dev/null +++ b/delivery_carrier_agency/readme/DESCRIPTION.rst @@ -0,0 +1,4 @@ +Add carrier agency concept +A delivery carrier may have one or mutliple agencies. +The module does not add any logic around these agencies, it will be done in dedicated carrier modules if necessary. +For instance, when generating label, sometimes, some information may depend on the agency that will receive the package, which may depend on the warehouse diff --git a/delivery_carrier_agency/security/ir.model.access.csv b/delivery_carrier_agency/security/ir.model.access.csv new file mode 100644 index 0000000000..c7a477a71c --- /dev/null +++ b/delivery_carrier_agency/security/ir.model.access.csv @@ -0,0 +1,3 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_delivery_carrier_agency_wh_user,delivery.carrier.agency.wh.user,model_delivery_carrier_agency,stock.group_stock_user,1,0,0,0 +access_delivery_carrier_agency_wh_manager,delivery.carrier.agency.wh.manager,model_delivery_carrier_agency,stock.group_stock_manager,1,1,1,1 diff --git a/delivery_carrier_agency/static/description/icon.png b/delivery_carrier_agency/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/delivery_carrier_agency/static/description/index.html b/delivery_carrier_agency/static/description/index.html new file mode 100644 index 0000000000..1fda8c24ee --- /dev/null +++ b/delivery_carrier_agency/static/description/index.html @@ -0,0 +1,422 @@ + + + + + + +Delivery Carrier Agency + + + +
+

Delivery Carrier Agency

+ + +

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

+

Add carrier agency concept +A delivery carrier may have one or mutliple agencies. +The module does not add any logic around these agencies, it will be done in dedicated carrier modules if necessary. +For instance, when generating label, sometimes, some information may depend on the agency that will receive the package, which may depend on the warehouse

+

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

+

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

+
+
+

Credits

+
+

Authors

+
    +
  • Akretion
    • +
+
+
+

Contributors

+ +
+
+

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/delivery_carrier_agency/tests/__init__.py b/delivery_carrier_agency/tests/__init__.py new file mode 100644 index 0000000000..1f4362b716 --- /dev/null +++ b/delivery_carrier_agency/tests/__init__.py @@ -0,0 +1 @@ +from . import test_carrier_agency diff --git a/delivery_carrier_agency/tests/test_carrier_agency.py b/delivery_carrier_agency/tests/test_carrier_agency.py new file mode 100644 index 0000000000..e23205e307 --- /dev/null +++ b/delivery_carrier_agency/tests/test_carrier_agency.py @@ -0,0 +1,43 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo.tests.common import TransactionCase + + +class TestCarrierAgency(TransactionCase): + def test_get_carrier_agency(self): + """Test finding the correct account for a picking""" + chicago_wh = self.env.ref("stock.stock_warehouse_shop0") + san_fransico_wh = self.env.ref("stock.warehouse0") + agency_chicago = self.env["delivery.carrier.agency"].create( + { + "name": "Normal Carrier Chicago agency", + "delivery_type": "fixed", + "warehouse_ids": [(6, 0, chicago_wh.ids)], + } + ) + agency_san_fransisco = self.env["delivery.carrier.agency"].create( + { + "name": "Normal Carrier San Fransisco agency", + "delivery_type": "fixed", + "warehouse_ids": [(6, 0, san_fransico_wh.ids)], + } + ) + san_fransisco_picking = self.env["stock.picking"].new( + dict( + carrier_id=self.env.ref("delivery.normal_delivery_carrier").id, + company_id=self.env.user.company_id.id, + location_id=san_fransico_wh.lot_stock_id.id, + ) + ) + agency = san_fransisco_picking._get_carrier_agency() + self.assertEqual(agency, agency_san_fransisco) + + chicago_picking = self.env["stock.picking"].new( + dict( + carrier_id=self.env.ref("delivery.normal_delivery_carrier").id, + company_id=self.env.user.company_id.id, + location_id=chicago_wh.lot_stock_id.id, + ) + ) + agency = chicago_picking._get_carrier_agency() + self.assertEqual(agency, agency_chicago) diff --git a/delivery_carrier_agency/views/delivery_carrier_agency_view.xml b/delivery_carrier_agency/views/delivery_carrier_agency_view.xml new file mode 100644 index 0000000000..35cd55e21d --- /dev/null +++ b/delivery_carrier_agency/views/delivery_carrier_agency_view.xml @@ -0,0 +1,56 @@ + + + + + delivery.carrier.agency + + + + + + + + + + + + delivery_base.delivery.carrier.agency.form + delivery.carrier.agency + +
+ +
+

+ +

+
+ + + + + + + + +
+ + + + + Carrier Agency + delivery.carrier.agency + tree,form + + + + From c1ba7d965cd61599105d857e58007079d8915e6c Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Thu, 24 Nov 2022 13:13:40 +0100 Subject: [PATCH 02/11] [MIG][16] Migrate delivery_carrier_agency to v16 --- delivery_carrier_agency/__manifest__.py | 2 +- delivery_carrier_agency/models/stock_picking.py | 2 +- delivery_carrier_agency/tests/test_carrier_agency.py | 8 ++++---- .../views/delivery_carrier_agency_view.xml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/delivery_carrier_agency/__manifest__.py b/delivery_carrier_agency/__manifest__.py index c7f2fe301f..9e3c35389a 100644 --- a/delivery_carrier_agency/__manifest__.py +++ b/delivery_carrier_agency/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Delivery Carrier Agency", "summary": "Add a model for Carrier Agencies", - "version": "14.0.1.0.1", + "version": "16.0.1.0.0", "category": "Delivery", "website": "https://github.com/OCA/delivery-carrier", "author": "Akretion,Odoo Community Association (OCA)", diff --git a/delivery_carrier_agency/models/stock_picking.py b/delivery_carrier_agency/models/stock_picking.py index e669116c1c..0ac7d58290 100644 --- a/delivery_carrier_agency/models/stock_picking.py +++ b/delivery_carrier_agency/models/stock_picking.py @@ -8,7 +8,7 @@ class StockPicking(models.Model): def _get_domain_agency(self): self.ensure_one() - wh = self.location_id.get_warehouse() + wh = self.location_id.warehouse_id return [ ("delivery_type", "=", self.carrier_id.delivery_type), "|", diff --git a/delivery_carrier_agency/tests/test_carrier_agency.py b/delivery_carrier_agency/tests/test_carrier_agency.py index e23205e307..1e47304856 100644 --- a/delivery_carrier_agency/tests/test_carrier_agency.py +++ b/delivery_carrier_agency/tests/test_carrier_agency.py @@ -11,20 +11,20 @@ def test_get_carrier_agency(self): agency_chicago = self.env["delivery.carrier.agency"].create( { "name": "Normal Carrier Chicago agency", - "delivery_type": "fixed", + "delivery_type": "base_on_rule", "warehouse_ids": [(6, 0, chicago_wh.ids)], } ) agency_san_fransisco = self.env["delivery.carrier.agency"].create( { "name": "Normal Carrier San Fransisco agency", - "delivery_type": "fixed", + "delivery_type": "base_on_rule", "warehouse_ids": [(6, 0, san_fransico_wh.ids)], } ) san_fransisco_picking = self.env["stock.picking"].new( dict( - carrier_id=self.env.ref("delivery.normal_delivery_carrier").id, + carrier_id=self.env.ref("delivery.delivery_carrier").id, company_id=self.env.user.company_id.id, location_id=san_fransico_wh.lot_stock_id.id, ) @@ -34,7 +34,7 @@ def test_get_carrier_agency(self): chicago_picking = self.env["stock.picking"].new( dict( - carrier_id=self.env.ref("delivery.normal_delivery_carrier").id, + carrier_id=self.env.ref("delivery.delivery_carrier").id, company_id=self.env.user.company_id.id, location_id=chicago_wh.lot_stock_id.id, ) diff --git a/delivery_carrier_agency/views/delivery_carrier_agency_view.xml b/delivery_carrier_agency/views/delivery_carrier_agency_view.xml index 35cd55e21d..6e8bec3197 100644 --- a/delivery_carrier_agency/views/delivery_carrier_agency_view.xml +++ b/delivery_carrier_agency/views/delivery_carrier_agency_view.xml @@ -48,7 +48,7 @@ From 8bce33ecfabf6ed09445c7fa3f71699dbe8e5e16 Mon Sep 17 00:00:00 2001 From: oca-ci Date: Tue, 6 Dec 2022 08:25:08 +0000 Subject: [PATCH 03/11] [UPD] Update delivery_carrier_agency.pot --- delivery_carrier_agency/i18n/delivery_carrier_agency.pot | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/delivery_carrier_agency/i18n/delivery_carrier_agency.pot b/delivery_carrier_agency/i18n/delivery_carrier_agency.pot index a9b0446a73..f66cd6d9a1 100644 --- a/delivery_carrier_agency/i18n/delivery_carrier_agency.pot +++ b/delivery_carrier_agency/i18n/delivery_carrier_agency.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 14.0\n" +"Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -47,7 +47,6 @@ msgstr "" #. module: delivery_carrier_agency #: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__display_name -#: model:ir.model.fields,field_description:delivery_carrier_agency.field_stock_picking__display_name msgid "Display Name" msgstr "" @@ -58,13 +57,11 @@ msgstr "" #. module: delivery_carrier_agency #: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__id -#: model:ir.model.fields,field_description:delivery_carrier_agency.field_stock_picking__id msgid "ID" msgstr "" #. module: delivery_carrier_agency #: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency____last_update -#: model:ir.model.fields,field_description:delivery_carrier_agency.field_stock_picking____last_update msgid "Last Modified on" msgstr "" From f141c3b23a39e42e888d42c153fe5c3a0ef62eaa Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Tue, 6 Dec 2022 08:28:39 +0000 Subject: [PATCH 04/11] [UPD] README.rst --- delivery_carrier_agency/README.rst | 10 +++++----- delivery_carrier_agency/static/description/index.html | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/delivery_carrier_agency/README.rst b/delivery_carrier_agency/README.rst index 827c4ebb6e..250d461d6f 100644 --- a/delivery_carrier_agency/README.rst +++ b/delivery_carrier_agency/README.rst @@ -14,13 +14,13 @@ Delivery Carrier Agency :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/14.0/delivery_carrier_agency + :target: https://github.com/OCA/delivery-carrier/tree/16.0/delivery_carrier_agency :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-14-0/delivery-carrier-14-0-delivery_carrier_agency + :target: https://translation.odoo-community.org/projects/delivery-carrier-16-0/delivery-carrier-16-0-delivery_carrier_agency :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/99/14.0 + :target: https://runbot.odoo-community.org/runbot/99/16.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -41,7 +41,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 smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -71,6 +71,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/delivery_carrier_agency/static/description/index.html b/delivery_carrier_agency/static/description/index.html index 1fda8c24ee..9448ec5795 100644 --- a/delivery_carrier_agency/static/description/index.html +++ b/delivery_carrier_agency/static/description/index.html @@ -367,7 +367,7 @@

Delivery Carrier Agency

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

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

+

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

Add carrier agency concept A delivery carrier may have one or mutliple agencies. The module does not add any logic around these agencies, it will be done in dedicated carrier modules if necessary. @@ -389,7 +389,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 smashing it by providing a detailed and welcomed -feedback.

+feedback.

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

@@ -413,7 +413,7 @@

Maintainers

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 ee20031f306e950cfb91f77c27d4a366458d9d7a Mon Sep 17 00:00:00 2001 From: Ivorra78 Date: Thu, 3 Aug 2023 12:24:16 +0000 Subject: [PATCH 05/11] Added translation using Weblate (Spanish) --- delivery_carrier_agency/i18n/es.po | 110 +++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 delivery_carrier_agency/i18n/es.po diff --git a/delivery_carrier_agency/i18n/es.po b/delivery_carrier_agency/i18n/es.po new file mode 100644 index 0000000000..b5f56cf1c9 --- /dev/null +++ b/delivery_carrier_agency/i18n/es.po @@ -0,0 +1,110 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * delivery_carrier_agency +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\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" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__partner_id +msgid "Address" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.actions.act_window,name:delivery_carrier_agency.action_carrier_agency +#: model:ir.model,name:delivery_carrier_agency.model_delivery_carrier_agency +#: model:ir.ui.menu,name:delivery_carrier_agency.carrier_agency_menu +msgid "Carrier Agency" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__carrier_ids +msgid "Carriers" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__create_uid +msgid "Created by" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__create_date +msgid "Created on" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__delivery_type +msgid "Delivery Type" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__display_name +msgid "Display Name" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__external_reference +msgid "External Reference" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__id +msgid "ID" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency____last_update +msgid "Last Modified on" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__write_uid +msgid "Last Updated by" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__write_date +msgid "Last Updated on" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__name +msgid "Name" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,help:delivery_carrier_agency.field_delivery_carrier_agency__external_reference +msgid "Reference or code supplied by the carrier" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__sequence +msgid "Sequence" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,help:delivery_carrier_agency.field_delivery_carrier_agency__carrier_ids +msgid "" +"This field may be used to link an account to specific delivery methods It " +"may be usefull to find an account with more precision than with only the " +"delivery type" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model,name:delivery_carrier_agency.model_stock_picking +msgid "Transfer" +msgstr "" + +#. module: delivery_carrier_agency +#: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__warehouse_ids +msgid "Warehouses" +msgstr "" From 99786e5cb33409f7e23a7be62c5aba0f7fc00cb2 Mon Sep 17 00:00:00 2001 From: Ivorra78 Date: Thu, 3 Aug 2023 12:25:44 +0000 Subject: [PATCH 06/11] Translated using Weblate (Spanish) Currently translated at 100.0% (18 of 18 strings) Translation: delivery-carrier-16.0/delivery-carrier-16.0-delivery_carrier_agency Translate-URL: https://translation.odoo-community.org/projects/delivery-carrier-16-0/delivery-carrier-16-0-delivery_carrier_agency/es/ --- delivery_carrier_agency/i18n/es.po | 41 +++++++++++++++++------------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/delivery_carrier_agency/i18n/es.po b/delivery_carrier_agency/i18n/es.po index b5f56cf1c9..0679bf4392 100644 --- a/delivery_carrier_agency/i18n/es.po +++ b/delivery_carrier_agency/i18n/es.po @@ -6,90 +6,92 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2023-08-03 15:09+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_carrier_agency #: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__partner_id msgid "Address" -msgstr "" +msgstr "Dirección" #. module: delivery_carrier_agency #: model:ir.actions.act_window,name:delivery_carrier_agency.action_carrier_agency #: model:ir.model,name:delivery_carrier_agency.model_delivery_carrier_agency #: model:ir.ui.menu,name:delivery_carrier_agency.carrier_agency_menu msgid "Carrier Agency" -msgstr "" +msgstr "Agencia de transportes" #. module: delivery_carrier_agency #: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__carrier_ids msgid "Carriers" -msgstr "" +msgstr "Transportistas" #. module: delivery_carrier_agency #: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__create_uid msgid "Created by" -msgstr "" +msgstr "Creado por" #. module: delivery_carrier_agency #: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__create_date msgid "Created on" -msgstr "" +msgstr "Creado el" #. module: delivery_carrier_agency #: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__delivery_type msgid "Delivery Type" -msgstr "" +msgstr "Tipo de entrega" #. module: delivery_carrier_agency #: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__display_name msgid "Display Name" -msgstr "" +msgstr "Mostrar Nombre" #. module: delivery_carrier_agency #: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__external_reference msgid "External Reference" -msgstr "" +msgstr "Referencia Externa" #. module: delivery_carrier_agency #: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__id msgid "ID" -msgstr "" +msgstr "ID (identificación)" #. module: delivery_carrier_agency #: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency____last_update msgid "Last Modified on" -msgstr "" +msgstr "Última Modificación el" #. module: delivery_carrier_agency #: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__write_uid msgid "Last Updated by" -msgstr "" +msgstr "Actualizado por última vez por" #. module: delivery_carrier_agency #: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__write_date msgid "Last Updated on" -msgstr "" +msgstr "Actualizado por última vez el" #. module: delivery_carrier_agency #: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__name msgid "Name" -msgstr "" +msgstr "Nombre" #. module: delivery_carrier_agency #: model:ir.model.fields,help:delivery_carrier_agency.field_delivery_carrier_agency__external_reference msgid "Reference or code supplied by the carrier" -msgstr "" +msgstr "Referencia o código facilitado por el transportista" #. module: delivery_carrier_agency #: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__sequence msgid "Sequence" -msgstr "" +msgstr "Secuencia" #. module: delivery_carrier_agency #: model:ir.model.fields,help:delivery_carrier_agency.field_delivery_carrier_agency__carrier_ids @@ -98,13 +100,16 @@ msgid "" "may be usefull to find an account with more precision than with only the " "delivery type" msgstr "" +"Este campo puede utilizarse para vincular una cuenta a métodos de entrega " +"específicos Puede ser útil para encontrar una cuenta con más precisión que " +"con sólo el tipo de entrega" #. module: delivery_carrier_agency #: model:ir.model,name:delivery_carrier_agency.model_stock_picking msgid "Transfer" -msgstr "" +msgstr "Transferencia" #. module: delivery_carrier_agency #: model:ir.model.fields,field_description:delivery_carrier_agency.field_delivery_carrier_agency__warehouse_ids msgid "Warehouses" -msgstr "" +msgstr "Almacenes" From a2688a64bfea959ad5293b99f0380387f92c671c Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Sun, 3 Sep 2023 12:29:44 +0000 Subject: [PATCH 07/11] [UPD] README.rst --- delivery_carrier_agency/README.rst | 15 ++++---- .../static/description/index.html | 34 ++++++++++--------- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/delivery_carrier_agency/README.rst b/delivery_carrier_agency/README.rst index 250d461d6f..b3f244f3e0 100644 --- a/delivery_carrier_agency/README.rst +++ b/delivery_carrier_agency/README.rst @@ -2,10 +2,13 @@ Delivery Carrier Agency ======================= -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:155c94c31233b8200c26d782174022e62c7ce0e6a10cd43d629f7a2d1e9cb307 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status @@ -19,11 +22,11 @@ Delivery Carrier Agency .. |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-delivery_carrier_agency :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/99/16.0 - :alt: Try me on Runbot +.. |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| +|badge1| |badge2| |badge3| |badge4| |badge5| Add carrier agency concept A delivery carrier may have one or mutliple agencies. @@ -40,7 +43,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 smashing it by providing a detailed and welcomed +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. diff --git a/delivery_carrier_agency/static/description/index.html b/delivery_carrier_agency/static/description/index.html index 9448ec5795..6bb1b8d212 100644 --- a/delivery_carrier_agency/static/description/index.html +++ b/delivery_carrier_agency/static/description/index.html @@ -1,20 +1,20 @@ - + - + Delivery Carrier Agency