From e7e58c27334a021486ca10736083c1b7732b4208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20BEAU?= Date: Sun, 30 Aug 2020 10:58:44 +0200 Subject: [PATCH] extract delivery_carrier_info from base_delivery_carrier_label --- base_delivery_carrier_label/__manifest__.py | 4 +- .../models/delivery_carrier.py | 2 - .../views/delivery.xml | 18 --------- delivery_carrier_info/__init__.py | 1 + delivery_carrier_info/__manifest__.py | 30 +++++++++++++++ delivery_carrier_info/models/__init__.py | 1 + .../models/delivery_carrier.py | 14 +++++++ delivery_carrier_info/readme/CONTRIBUTORS.rst | 2 + delivery_carrier_info/readme/DESCRIPTION.rst | 1 + delivery_carrier_info/readme/USAGE.rst | 1 + delivery_carrier_info/views/delivery_view.xml | 37 +++++++++++++++++++ 11 files changed, 89 insertions(+), 22 deletions(-) create mode 100644 delivery_carrier_info/__init__.py create mode 100644 delivery_carrier_info/__manifest__.py create mode 100644 delivery_carrier_info/models/__init__.py create mode 100644 delivery_carrier_info/models/delivery_carrier.py create mode 100644 delivery_carrier_info/readme/CONTRIBUTORS.rst create mode 100644 delivery_carrier_info/readme/DESCRIPTION.rst create mode 100644 delivery_carrier_info/readme/USAGE.rst create mode 100644 delivery_carrier_info/views/delivery_view.xml diff --git a/base_delivery_carrier_label/__manifest__.py b/base_delivery_carrier_label/__manifest__.py index 02908bbb62..d0c188a839 100644 --- a/base_delivery_carrier_label/__manifest__.py +++ b/base_delivery_carrier_label/__manifest__.py @@ -2,11 +2,11 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). { "name": "Base module for carrier labels", - "version": "13.0.1.0.0", + "version": "13.0.2.0.0", "author": "Camptocamp,Akretion,Odoo Community Association (OCA)", "maintainer": "Camptocamp", "category": "Delivery", - "depends": ["delivery"], + "depends": ["delivery_carrier_info"], "website": "https://github.com/OCA/delivery-carrier", "data": [ "views/delivery.xml", diff --git a/base_delivery_carrier_label/models/delivery_carrier.py b/base_delivery_carrier_label/models/delivery_carrier.py index 98ca3f4a4a..76ec212738 100644 --- a/base_delivery_carrier_label/models/delivery_carrier.py +++ b/base_delivery_carrier_label/models/delivery_carrier.py @@ -9,8 +9,6 @@ class DeliveryCarrier(models.Model): _inherit = "delivery.carrier" delivery_type = fields.Selection() - code = fields.Char(help="Delivery Method Code (according to carrier)") - description = fields.Text() available_option_ids = fields.One2many( comodel_name="delivery.carrier.option", inverse_name="carrier_id", diff --git a/base_delivery_carrier_label/views/delivery.xml b/base_delivery_carrier_label/views/delivery.xml index 85128ff28f..61b0900118 100644 --- a/base_delivery_carrier_label/views/delivery.xml +++ b/base_delivery_carrier_label/views/delivery.xml @@ -72,29 +72,11 @@ delivery.carrier - - - - - - - - - - delivery_carrier_base.tree - delivery.carrier - - - - - - - diff --git a/delivery_carrier_info/__init__.py b/delivery_carrier_info/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/delivery_carrier_info/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/delivery_carrier_info/__manifest__.py b/delivery_carrier_info/__manifest__.py new file mode 100644 index 0000000000..06d8987cd0 --- /dev/null +++ b/delivery_carrier_info/__manifest__.py @@ -0,0 +1,30 @@ +# Copyright 2020 Akretion (https://www.akretion.com). +# @author Sébastien BEAU +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + + +{ + "name": "Delivery Carrier Info", + "summary": "Add code and description on carrier", + "version": "12.0.1.0.0", + "category": "Delivery", + "website": "www.akretion.com", + "author": "Akretion,Odoo Community Association (OCA)", + "license": "AGPL-3", + "application": False, + "installable": True, + "external_dependencies": { + "python": [], + "bin": [], + }, + "depends": [ + "delivery", + ], + "data": [ + "views/delivery_view.xml" + ], + "demo": [ + ], + "qweb": [ + ] +} diff --git a/delivery_carrier_info/models/__init__.py b/delivery_carrier_info/models/__init__.py new file mode 100644 index 0000000000..0a1fe29fbd --- /dev/null +++ b/delivery_carrier_info/models/__init__.py @@ -0,0 +1 @@ +from . import delivery_carrier diff --git a/delivery_carrier_info/models/delivery_carrier.py b/delivery_carrier_info/models/delivery_carrier.py new file mode 100644 index 0000000000..b0b5c4d3f7 --- /dev/null +++ b/delivery_carrier_info/models/delivery_carrier.py @@ -0,0 +1,14 @@ +# Copyright 2020 Akretion (https://www.akretion.com). +# Copyright 2020 Camptocamp SA +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class DeliveryCarrier(models.Model): + _inherit = 'delivery.carrier' + + code = fields.Char( + help="Delivery Method Code (according to carrier)", + ) + description = fields.Text() diff --git a/delivery_carrier_info/readme/CONTRIBUTORS.rst b/delivery_carrier_info/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..0fecfdcb73 --- /dev/null +++ b/delivery_carrier_info/readme/CONTRIBUTORS.rst @@ -0,0 +1,2 @@ +* Sébastien BEAU +* Guewen Baconnier diff --git a/delivery_carrier_info/readme/DESCRIPTION.rst b/delivery_carrier_info/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..f73bfee186 --- /dev/null +++ b/delivery_carrier_info/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module add the field "code" and "description" on the delivery carrier. diff --git a/delivery_carrier_info/readme/USAGE.rst b/delivery_carrier_info/readme/USAGE.rst new file mode 100644 index 0000000000..3c44391613 --- /dev/null +++ b/delivery_carrier_info/readme/USAGE.rst @@ -0,0 +1 @@ +In your delivery carrier you can fill the code and the description diff --git a/delivery_carrier_info/views/delivery_view.xml b/delivery_carrier_info/views/delivery_view.xml new file mode 100644 index 0000000000..fd47b26c57 --- /dev/null +++ b/delivery_carrier_info/views/delivery_view.xml @@ -0,0 +1,37 @@ + + + + + delivery_base.delivery.carrier.view_form + delivery.carrier + + + + + + + + + + + + + + + + + + + + delivery_carrier_base.tree + delivery.carrier + + + + + + + + + +