From b2eda2a23b1f26eee68329d9a084afe5704114fc Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Fri, 1 Oct 2021 21:10:54 +0200 Subject: [PATCH] [MIG] sale_confirm_wizard from v10 to v14 --- sale_confirm_wizard/__init__.py | 4 +--- sale_confirm_wizard/__manifest__.py | 9 +++++---- sale_confirm_wizard/models/__init__.py | 1 + .../{sale.py => models/sale_order.py} | 5 ++--- sale_confirm_wizard/security/ir.model.access.csv | 2 ++ .../{sale_view.xml => views/sale_order.xml} | 7 ++++--- sale_confirm_wizard/wizard/__init__.py | 2 -- sale_confirm_wizard/wizard/sale_confirm.py | 14 ++++++-------- sale_confirm_wizard/wizard/sale_confirm_view.xml | 3 ++- 9 files changed, 23 insertions(+), 24 deletions(-) create mode 100644 sale_confirm_wizard/models/__init__.py rename sale_confirm_wizard/{sale.py => models/sale_order.py} (80%) create mode 100644 sale_confirm_wizard/security/ir.model.access.csv rename sale_confirm_wizard/{sale_view.xml => views/sale_order.xml} (66%) diff --git a/sale_confirm_wizard/__init__.py b/sale_confirm_wizard/__init__.py index 7971819..9b42961 100644 --- a/sale_confirm_wizard/__init__.py +++ b/sale_confirm_wizard/__init__.py @@ -1,4 +1,2 @@ -# -*- coding: utf-8 -*- - -from . import sale +from . import models from . import wizard diff --git a/sale_confirm_wizard/__manifest__.py b/sale_confirm_wizard/__manifest__.py index 453e6f1..bbe3068 100644 --- a/sale_confirm_wizard/__manifest__.py +++ b/sale_confirm_wizard/__manifest__.py @@ -1,10 +1,10 @@ -# -*- coding: utf-8 -*- -# © 2017 Akretion (Alexis de Lattre ) +# Copyright 2017-2021 Akretion France (http://www.akretion.com/) +# @author: Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { 'name': 'Sale Confirm Wizard', - 'version': '10.0.1.0.0', + 'version': '14.0.1.0.0', 'category': 'Sales', 'license': 'AGPL-3', 'summary': 'Open a wizard when you confirm a sale order to update important info', @@ -31,7 +31,8 @@ This module has been written by Alexis de Lattre from Akretion 'depends': ['sale'], 'data': [ 'wizard/sale_confirm_view.xml', - 'sale_view.xml', + 'views/sale_order.xml', + 'security/ir.model.access.csv', ], 'installable': True, } diff --git a/sale_confirm_wizard/models/__init__.py b/sale_confirm_wizard/models/__init__.py new file mode 100644 index 0000000..6aacb75 --- /dev/null +++ b/sale_confirm_wizard/models/__init__.py @@ -0,0 +1 @@ +from . import sale_order diff --git a/sale_confirm_wizard/sale.py b/sale_confirm_wizard/models/sale_order.py similarity index 80% rename from sale_confirm_wizard/sale.py rename to sale_confirm_wizard/models/sale_order.py index 8eacbfe..c27c1a9 100644 --- a/sale_confirm_wizard/sale.py +++ b/sale_confirm_wizard/models/sale_order.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- -# Copyright 2020 Akretion France (http://www.akretion.com/) +# Copyright 2020-2021 Akretion France (http://www.akretion.com/) # @author: Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). @@ -13,6 +12,6 @@ class SaleOrder(models.Model): """This method is designed to be inherited. For example, inherit it if you don't want to start the wizard in some scenarios""" - action = self.env.ref( + action = self.sudo().env.ref( 'sale_confirm_wizard.sale_confirm_action').read()[0] return action diff --git a/sale_confirm_wizard/security/ir.model.access.csv b/sale_confirm_wizard/security/ir.model.access.csv new file mode 100644 index 0000000..fdca947 --- /dev/null +++ b/sale_confirm_wizard/security/ir.model.access.csv @@ -0,0 +1,2 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_sale_confirm_wizard,Full access on sale.confirm wizard,model_sale_confirm,sales_team.group_sale_salesman,1,1,1,1 diff --git a/sale_confirm_wizard/sale_view.xml b/sale_confirm_wizard/views/sale_order.xml similarity index 66% rename from sale_confirm_wizard/sale_view.xml rename to sale_confirm_wizard/views/sale_order.xml index 28e36d9..e6acd04 100644 --- a/sale_confirm_wizard/sale_view.xml +++ b/sale_confirm_wizard/views/sale_order.xml @@ -1,6 +1,7 @@ @@ -11,10 +12,10 @@ sale.order - - diff --git a/sale_confirm_wizard/wizard/__init__.py b/sale_confirm_wizard/wizard/__init__.py index 6b461c2..cfd3df7 100644 --- a/sale_confirm_wizard/wizard/__init__.py +++ b/sale_confirm_wizard/wizard/__init__.py @@ -1,3 +1 @@ -# -*- coding: utf-8 -*- - from . import sale_confirm diff --git a/sale_confirm_wizard/wizard/sale_confirm.py b/sale_confirm_wizard/wizard/sale_confirm.py index 0821700..5ce607e 100644 --- a/sale_confirm_wizard/wizard/sale_confirm.py +++ b/sale_confirm_wizard/wizard/sale_confirm.py @@ -1,10 +1,10 @@ -# -*- coding: utf-8 -*- -# © 2017 Akretion (Alexis de Lattre ) +# Copyright 2017-2021 Akretion France (http://www.akretion.com/) +# @author: Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo import models, fields, api, _ from odoo.exceptions import UserError -from odoo.addons.base.res.res_partner import WARNING_MESSAGE +from odoo.addons.base.models.res_partner import WARNING_MESSAGE class SaleConfirm(models.TransientModel): @@ -19,12 +19,12 @@ class SaleConfirm(models.TransientModel): partner_invoice_id = fields.Many2one( 'res.partner', 'Invoice Address', required=True) show_partner_invoice_id = fields.Many2one( - related='partner_invoice_id', readonly=True, + related='partner_invoice_id', string='Detailed Invoice Address') partner_shipping_id = fields.Many2one( 'res.partner', 'Delivery Address', required=True) show_partner_shipping_id = fields.Many2one( - related='partner_shipping_id', readonly=True, + related='partner_shipping_id', string='Detailed Delivery Address') sale_warn = fields.Selection( WARNING_MESSAGE, 'Sale Warning Type', readonly=True) @@ -46,7 +46,7 @@ class SaleConfirm(models.TransientModel): @api.model def default_get(self, fields): - res = super(SaleConfirm, self).default_get(fields) + res = super().default_get(fields) assert self._context.get('active_model') == 'sale.order',\ 'active_model should be sale.order' order = self.env['sale.order'].browse(self._context.get('active_id')) @@ -54,7 +54,6 @@ class SaleConfirm(models.TransientModel): res.update(default) return res - @api.multi def _prepare_update_so(self): self.ensure_one() return { @@ -64,7 +63,6 @@ class SaleConfirm(models.TransientModel): 'partner_shipping_id': self.partner_shipping_id.id, } - @api.multi def confirm(self): self.ensure_one() partner = self.sale_id.partner_id.commercial_partner_id diff --git a/sale_confirm_wizard/wizard/sale_confirm_view.xml b/sale_confirm_wizard/wizard/sale_confirm_view.xml index 13791d5..7cdc19e 100644 --- a/sale_confirm_wizard/wizard/sale_confirm_view.xml +++ b/sale_confirm_wizard/wizard/sale_confirm_view.xml @@ -1,6 +1,7 @@