diff --git a/odex25_base/base_odex/models/res_users.py b/odex25_base/base_odex/models/res_users.py index 39e42fd11..c6f3ddf3a 100644 --- a/odex25_base/base_odex/models/res_users.py +++ b/odex25_base/base_odex/models/res_users.py @@ -25,3 +25,4 @@ class ResUsers(models.Model): def get_res_users_id(self): for rec in self: rec.res_users_id = rec.id + \ No newline at end of file diff --git a/odex25_base/dynamic_reject_workflow/models/reject_workflow.py b/odex25_base/dynamic_reject_workflow/models/reject_workflow.py index f61da0654..8666e37fb 100644 --- a/odex25_base/dynamic_reject_workflow/models/reject_workflow.py +++ b/odex25_base/dynamic_reject_workflow/models/reject_workflow.py @@ -80,14 +80,16 @@ class RejectButton(models.Model): class MailThread(models.AbstractModel): _inherit = 'mail.thread' - reason = fields.Text(string='Reason/Justification') + reason = fields.Text(string='Reason/Justification', + tracking=True + ) def action_reject_workflow(self): return { 'name': _('Reject'), 'type': 'ir.actions.act_window', 'view_mode': 'form', - 'res_model': 'reject.wizard', + 'res_model': 'all.reject.wizard', 'target': 'new', } diff --git a/odex25_base/dynamic_reject_workflow/security/ir.model.access.csv b/odex25_base/dynamic_reject_workflow/security/ir.model.access.csv index a3086ebed..b1ea188d4 100644 --- a/odex25_base/dynamic_reject_workflow/security/ir.model.access.csv +++ b/odex25_base/dynamic_reject_workflow/security/ir.model.access.csv @@ -1,5 +1,6 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_reject_workflow_manager,reject_workflow_manager,model_reject_workflow,reject_group_manager,1,1,1,1 +access_all_reject_wizard_manager,all_reject_wizard_manager,model_all_reject_wizard,reject_group_manager,1,1,1,1 access_reject_button,reject_button,model_reject_button,base.group_user,1,1,1,1 access_reject_workflow,reject_workflow,model_reject_workflow,base.group_user,1,0,0,0 access_reject_button_wizard_manager,reject_button_wizard_manager,model_reject_button_wizard,reject_group_manager,1,1,1,1 diff --git a/odex25_base/dynamic_reject_workflow/wizard/reject_wizard.py b/odex25_base/dynamic_reject_workflow/wizard/reject_wizard.py index 03c309dc4..3c4352f4f 100644 --- a/odex25_base/dynamic_reject_workflow/wizard/reject_wizard.py +++ b/odex25_base/dynamic_reject_workflow/wizard/reject_wizard.py @@ -3,12 +3,13 @@ from odoo import models, fields class RejectWizard(models.TransientModel): - _name = 'reject.wizard' - _description = 'Reject Wizard' + _name = 'all.reject.wizard' + _description = 'All Reject Wizard' reason = fields.Text(string='Reason/Justification') def button_confirm(self): + print("*************RejectWizard*******************button_confirm**************") context = dict(self._context) active_model = context.get('active_model') active_id = context.get('active_id') diff --git a/odex25_base/dynamic_reject_workflow/wizard/reject_wizard.xml b/odex25_base/dynamic_reject_workflow/wizard/reject_wizard.xml index b1adc7e31..bc66de78b 100644 --- a/odex25_base/dynamic_reject_workflow/wizard/reject_wizard.xml +++ b/odex25_base/dynamic_reject_workflow/wizard/reject_wizard.xml @@ -2,8 +2,8 @@ - reject.wizard.view - reject.wizard + all.reject.wizard.view + all.reject.wizard
diff --git a/odex25_base/odex25_apps_features/wizard/base_module_uninstall.py b/odex25_base/odex25_apps_features/wizard/base_module_uninstall.py index 8e96435c8..00b15403a 100644 --- a/odex25_base/odex25_apps_features/wizard/base_module_uninstall.py +++ b/odex25_base/odex25_apps_features/wizard/base_module_uninstall.py @@ -11,9 +11,9 @@ class BaseModuleUninstall(models.TransientModel): is_restrict = fields.Boolean() password = fields.Char(required=True) - def action_uninstall(self): - if not tools.config.get('uninstall_password'): - raise ValidationError("Uninstall password not yet set!") - if self.password != tools.config.get('uninstall_password').replace('\'', ''): - raise ValidationError("Invalid Password!") - return super(BaseModuleUninstall, self).action_uninstall() + # def action_uninstall(self): + # if not tools.config.get('uninstall_password'): + # raise ValidationError("Uninstall password not yet set!") + # if self.password != tools.config.get('uninstall_password').replace('\'', ''): + # raise ValidationError("Invalid Password!") + # return super(BaseModuleUninstall, self).action_uninstall()