From 8acd58d85c35601fba45ddb53085d1abc40d08fd Mon Sep 17 00:00:00 2001 From: "Valentin Vallaeys (vava)" Date: Mon, 20 Feb 2023 15:13:17 +0000 Subject: [PATCH] [REF] delivery_*, website_sale_**: dependency to delivery *: mondialrelay, stock_picking_batch **: delivery_mondialrelay, loyalty_delivery, picking Adapt dependency to `website_sale` directly instead of `website_sale_delivery`. Part-of: odoo/odoo#110686 --- addons/delivery_mondialrelay/__manifest__.py | 2 +- addons/delivery_stock_picking_batch/__manifest__.py | 2 +- addons/l10n_it_stock_ddt/__manifest__.py | 2 +- addons/website_sale_delivery_mondialrelay/__manifest__.py | 2 +- .../controllers/controllers.py | 2 +- addons/website_sale_loyalty_delivery/__manifest__.py | 3 ++- addons/website_sale_loyalty_delivery/controllers/main.py | 2 +- addons/website_sale_picking/__manifest__.py | 2 +- addons/website_sale_picking/views/templates.xml | 2 +- 9 files changed, 10 insertions(+), 9 deletions(-) diff --git a/addons/delivery_mondialrelay/__manifest__.py b/addons/delivery_mondialrelay/__manifest__.py index 56d3be8dba1..59c5d8e04f5 100644 --- a/addons/delivery_mondialrelay/__manifest__.py +++ b/addons/delivery_mondialrelay/__manifest__.py @@ -11,7 +11,7 @@ """, 'category': 'Inventory/Delivery', 'version': '0.1', - 'depends': ['delivery'], + 'depends': ['stock_delivery'], 'data': [ 'data/data.xml', 'views/views.xml', diff --git a/addons/delivery_stock_picking_batch/__manifest__.py b/addons/delivery_stock_picking_batch/__manifest__.py index 4e92b93b8a1..977c7d2114a 100644 --- a/addons/delivery_stock_picking_batch/__manifest__.py +++ b/addons/delivery_stock_picking_batch/__manifest__.py @@ -11,7 +11,7 @@ This module makes the link between the batch pickings and carrier applications. Allows to prepare batches depending on their carrier """, - 'depends': ['delivery', 'stock_picking_batch'], + 'depends': ['stock_delivery', 'stock_picking_batch'], 'data': [ 'views/stock_picking_type_views.xml', ], diff --git a/addons/l10n_it_stock_ddt/__manifest__.py b/addons/l10n_it_stock_ddt/__manifest__.py index 16f67cf008f..7b9f8aa02df 100644 --- a/addons/l10n_it_stock_ddt/__manifest__.py +++ b/addons/l10n_it_stock_ddt/__manifest__.py @@ -23,7 +23,7 @@ When invoices are related to their sale order and the sale order with the delivery, the system will automatically calculate the linked DDTs for every invoice line to export in the FatturaPA XML. """, - 'depends': ['l10n_it_edi', 'delivery', 'stock_account'], + 'depends': ['l10n_it_edi', 'stock_delivery', 'stock_account'], 'data': [ 'report/l10n_it_ddt_report.xml', 'views/stock_picking_views.xml', diff --git a/addons/website_sale_delivery_mondialrelay/__manifest__.py b/addons/website_sale_delivery_mondialrelay/__manifest__.py index b51fc63fdf2..d93112f986a 100644 --- a/addons/website_sale_delivery_mondialrelay/__manifest__.py +++ b/addons/website_sale_delivery_mondialrelay/__manifest__.py @@ -8,7 +8,7 @@ """, 'category': 'Website/Website', 'version': '0.1', - 'depends': ['website_sale_delivery', 'delivery_mondialrelay'], + 'depends': ['website_sale', 'delivery_mondialrelay'], 'data': [ 'views/delivery_carrier_views.xml', 'views/res_config_settings_views.xml', diff --git a/addons/website_sale_delivery_mondialrelay/controllers/controllers.py b/addons/website_sale_delivery_mondialrelay/controllers/controllers.py index 4617ceb3629..f8ca18ec0d2 100644 --- a/addons/website_sale_delivery_mondialrelay/controllers/controllers.py +++ b/addons/website_sale_delivery_mondialrelay/controllers/controllers.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from odoo import http, _ from odoo.addons.website_sale.controllers.main import WebsiteSale, PaymentPortal -from odoo.addons.website_sale_delivery.controllers.main import WebsiteSaleDelivery +from odoo.addons.website_sale.controllers.delivery_main import WebsiteSaleDelivery from odoo.exceptions import AccessDenied, ValidationError, UserError from odoo.http import request diff --git a/addons/website_sale_loyalty_delivery/__manifest__.py b/addons/website_sale_loyalty_delivery/__manifest__.py index 384abf5c020..147c595a052 100644 --- a/addons/website_sale_loyalty_delivery/__manifest__.py +++ b/addons/website_sale_loyalty_delivery/__manifest__.py @@ -6,7 +6,7 @@ 'description': """Allows to offer free shippings in loyalty program rewards on eCommerce""", 'category': 'Website/Website', 'version': '1.0', - 'depends': ['website_sale_delivery', 'website_sale_loyalty', 'sale_loyalty_delivery'], + 'depends': ['website_sale', 'website_sale_loyalty', 'sale_loyalty_delivery'], 'auto_install': True, 'assets': { 'web.assets_frontend': [ @@ -18,3 +18,4 @@ }, 'license': 'LGPL-3', } + diff --git a/addons/website_sale_loyalty_delivery/controllers/main.py b/addons/website_sale_loyalty_delivery/controllers/main.py index 3d9d217086c..afbf6c26091 100644 --- a/addons/website_sale_loyalty_delivery/controllers/main.py +++ b/addons/website_sale_loyalty_delivery/controllers/main.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- from odoo import http -from odoo.addons.website_sale_delivery.controllers.main import WebsiteSaleDelivery +from odoo.addons.website_sale.controllers.delivery_main import WebsiteSaleDelivery from odoo.http import request diff --git a/addons/website_sale_picking/__manifest__.py b/addons/website_sale_picking/__manifest__.py index 3bc09b01795..e0ce09933c3 100644 --- a/addons/website_sale_picking/__manifest__.py +++ b/addons/website_sale_picking/__manifest__.py @@ -8,7 +8,7 @@ 'description': """ Allows customers to pay for their orders at a shop, instead of paying online. """, - 'depends': ['website_sale_delivery', 'payment_custom'], + 'depends': ['website_sale', 'payment_custom'], 'data': [ 'data/website_sale_picking_data.xml', 'views/res_config_settings_views.xml', diff --git a/addons/website_sale_picking/views/templates.xml b/addons/website_sale_picking/views/templates.xml index e42cd0ead21..c9c214937fa 100644 --- a/addons/website_sale_picking/views/templates.xml +++ b/addons/website_sale_picking/views/templates.xml @@ -1,6 +1,6 @@ -