diff --git a/sales_order_double_approval/models/__init__.py b/sales_order_double_approval/models/__init__.py index 212bb5f2d..d682a085c 100644 --- a/sales_order_double_approval/models/__init__.py +++ b/sales_order_double_approval/models/__init__.py @@ -1,3 +1,24 @@ +# -*- coding: utf-8 -*- +############################################################################# +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2022-TODAY Cybrosys Technologies() +# Author: Cybrosys Techno Solutions() +# +# You can modify it under the terms of the GNU LESSER +# GENERAL PUBLIC LICENSE (LGPL v3), Version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details. +# +# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE +# (LGPL v3) along with this program. +# If not, see . +# +############################################################################# from . import res_company from . import res_config_settings from . import sale_order diff --git a/sales_order_double_approval/models/res_company.py b/sales_order_double_approval/models/res_company.py index b5a1f4d3b..21c139d01 100644 --- a/sales_order_double_approval/models/res_company.py +++ b/sales_order_double_approval/models/res_company.py @@ -1,3 +1,24 @@ +# -*- coding: utf-8 -*- +############################################################################# +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2022-TODAY Cybrosys Technologies() +# Author: Cybrosys Techno Solutions() +# +# You can modify it under the terms of the GNU LESSER +# GENERAL PUBLIC LICENSE (LGPL v3), Version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details. +# +# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE +# (LGPL v3) along with this program. +# If not, see . +# +############################################################################# from odoo import fields, models diff --git a/sales_order_double_approval/models/res_config_settings.py b/sales_order_double_approval/models/res_config_settings.py index 179c8b227..a976dae12 100644 --- a/sales_order_double_approval/models/res_config_settings.py +++ b/sales_order_double_approval/models/res_config_settings.py @@ -1,3 +1,24 @@ +# -*- coding: utf-8 -*- +############################################################################# +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2022-TODAY Cybrosys Technologies() +# Author: Cybrosys Techno Solutions() +# +# You can modify it under the terms of the GNU LESSER +# GENERAL PUBLIC LICENSE (LGPL v3), Version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details. +# +# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE +# (LGPL v3) along with this program. +# If not, see . +# +############################################################################# from odoo import fields, models, api diff --git a/sales_order_double_approval/models/sale_order.py b/sales_order_double_approval/models/sale_order.py index 09b0cf2cb..5f529ac95 100644 --- a/sales_order_double_approval/models/sale_order.py +++ b/sales_order_double_approval/models/sale_order.py @@ -1,27 +1,45 @@ +# -*- coding: utf-8 -*- +############################################################################# +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2022-TODAY Cybrosys Technologies() +# Author: Cybrosys Techno Solutions() +# +# You can modify it under the terms of the GNU LESSER +# GENERAL PUBLIC LICENSE (LGPL v3), Version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details. +# +# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE +# (LGPL v3) along with this program. +# If not, see . +# +############################################################################# from odoo import fields, models class SaleOrder(models.Model): - _inherit = ['sale.order'] + _inherit = 'sale.order' state = fields.Selection(selection_add= - [('to_approve', 'To Approve'), - ('sent',)], ondelete={'to_approve': 'cascade'}) + [('to_approve', 'To Approve')], ondelete={'to_approve': 'cascade'}) def button_approve(self): - self.write({'state': 'sale'}) + self.action_confirm() def action_confirm(self): - res = super(SaleOrder, self).action_confirm() - if self.company_id.so_double_validation: - if self.env['ir.config_parameter'].sudo().get_param('sales_order_double_approval.so_approval'): - if self.amount_total > float( - self.env['ir.config_parameter'].sudo().get_param('sales_order_double_approval.so_min_amount')): - if self.user_has_groups('sales_team.group_sale_manager'): - self.state = 'sale' - else: + if not self.user_has_groups('sales_team.group_sale_manager'): + if self.company_id.so_double_validation: + if self.env['ir.config_parameter'].sudo().get_param('sales_order_double_approval.so_approval'): + if self.amount_total > float( + self.env['ir.config_parameter'].sudo().get_param('sales_order_double_approval.so_min_amount')): self.state = 'to_approve' - return res + return + return super(SaleOrder, self).action_confirm() def action_cancel(self): self.state = 'cancel'