fix reject
This commit is contained in:
parent
fef32bed03
commit
a86eb20926
|
|
@ -25,3 +25,4 @@ class ResUsers(models.Model):
|
|||
def get_res_users_id(self):
|
||||
for rec in self:
|
||||
rec.res_users_id = rec.id
|
||||
|
||||
|
|
@ -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',
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
|
@ -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')
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
<odoo>
|
||||
<data>
|
||||
<record id="reject_wizard_view" model="ir.ui.view">
|
||||
<field name="name">reject.wizard.view</field>
|
||||
<field name="model">reject.wizard</field>
|
||||
<field name="name">all.reject.wizard.view</field>
|
||||
<field name="model">all.reject.wizard</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Reject Wizard">
|
||||
<group>
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
Loading…
Reference in New Issue