NaNtic
/
trytond-approval
mirror of https://github.com/NaN-tic/trytond-approval.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adapt to Tryton 5.2

This commit is contained in:
Albert Cervera i Areny 2019-07-18 23:29:54 +02:00
parent 3d2bc0c4f7
commit 982e6f62a6
8 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
__init__.py
View File

@ -1,7 +1,7 @@
# The COPYRIGHT file at the top level of this repository contains the full
# copyright notices and license terms.
from trytond.pool import Pool
import approval
from . import approval
def register():
Pool.register(

30
approval.py
View File

@ -3,6 +3,8 @@ from trytond.model import Workflow, ModelSQL, ModelView, fields
from trytond.pyson import Eval, Bool
from trytond.pool import Pool
from trytond.transaction import Transaction
from trytond.i18n import gettext
from trytond.exceptions import UserError
__all__ = ['Group', 'GroupUser', 'Request']
@ -104,17 +106,6 @@ class Request(Workflow, ModelSQL, ModelView):
'invisible': Eval('state') != 'pending',
},
})
cls._error_messages.update({
'forbidden_user': ('The user "%(user)s" cannot approve/reject '
'the approval request "%(request)s" because he isn\'t the '
'user of the request.'),
'user_not_in_group': ('The user "%(user)s" cannot '
'approve/reject the approval request "%(request)s" because'
' he isn\'t in the request\'s Group.'),
'delete_approved_rejected_request': (
'You cannot delete the approval request "%s" because it '
'isn\'t pending or cancelled.'),
})
@staticmethod
def _get_document():
@ -183,16 +174,12 @@ class Request(Workflow, ModelSQL, ModelView):
def _check_allowed_user(self, user):
if self.user:
if self.user != user:
self.raise_user_error('forbidden_user', {
'user': user.rec_name,
'request': self.rec_name,
})
raise UserError(gettext('approval.forbidden_user',
user=user.rec_name, request=self.rec_name))
elif self.group:
if user not in self.group.users:
self.raise_user_error('user_not_in_group', {
'user': user.rec_name,
'request': self.rec_name,
})
raise UserError(gettext('approval.user_not_in_group',
user=user.rec_name, request=self.rec_name))
@classmethod
@ModelView.button
@ -204,6 +191,7 @@ class Request(Workflow, ModelSQL, ModelView):
def delete(cls, requests):
for request in requests:
if request.state not in ('pending', 'cancelled'):
cls.raise_user_error('delete_approved_rejected_request',
(request.rec_name,))
raise UserError(gettext(
'approval.delete_approved_rejected_request',
request=request.rec_name))
super(Request, cls).delete(requests)

10
approval.xml
View File

@ -10,10 +10,6 @@
<field name="user" ref="res.user_admin"/>
<field name="group" ref="group_approval_admin"/>
</record>
<record model="res.user-res.group" id="user_trigger_group_approval_admin">
<field name="user" ref="res.user_trigger"/>
<field name="group" ref="group_approval_admin"/>
</record>
<record model="res.group" id="group_approval">
<field name="name">Approval</field>
@ -22,10 +18,6 @@
<field name="user" ref="res.user_admin"/>
<field name="group" ref="group_approval"/>
</record>
<record model="res.user-res.group" id="user_trigger_group_approval">
<field name="user" ref="res.user_trigger"/>
<field name="group" ref="group_approval"/>
</record>
<!-- approval.group -->
<record model="ir.ui.view" id="approval_group_view_form">
@ -167,7 +159,7 @@
parent="menu_approval" sequence="1" name="Approval Requests"/>
<menuitem name="Configuration" parent="menu_approval"
id="menu_configuration" sequence="0" icon="tryton-preferences"/>
id="menu_configuration" sequence="0" icon="tryton-settings"/>
<record model="ir.ui.menu-res.group"
id="menu_approval_group_approval_admin">
<field name="menu" ref="menu_configuration"/>

6
locale/ca.po
View File

@ -2,7 +2,7 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:approval.request:"
msgctxt "model:ir.message,text:forbidden_user"
msgid ""
"The user \"%(user)s\" cannot approve/reject the approval request "
"\"%(request)s\" because he isn't in the request's Group."
@ -10,7 +10,7 @@ msgstr ""
"L'usuari \"%(user)s\" no pot aprovar/rebutjar la petició d'aprovació "
"\"%(request)s\" perque no pertany al grup de la petició."
msgctxt "error:approval.request:"
msgctxt "model:ir.message,text:user_not_in_group"
msgid ""
"The user \"%(user)s\" cannot approve/reject the approval request "
"\"%(request)s\" because he isn't the user of the request."
@ -18,7 +18,7 @@ msgstr ""
"L'usuari \"%(user)s\" no pot aprovar/rebutjar la petició d'aprovació "
"\"%(request)s\" perque no és l'usuari de la petició."
msgctxt "error:approval.request:"
msgctxt "model:ir.message,text:delete_approved_rejected_request"
msgid ""
"You cannot delete the approval request \"%s\" because it isn't pending or "
"cancelled."

10
locale/es.po
View File

@ -2,7 +2,7 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:approval.request:"
msgctxt "model:ir.message,text:forbidden_user"
msgid ""
"The user \"%(user)s\" cannot approve/reject the approval request "
"\"%(request)s\" because he isn't in the request's Group."
@ -10,7 +10,7 @@ msgstr ""
"El usuario \"%(user)s\" no puede aprobar/rechazar la petición de aprobación "
"\"%(request)s\" porque no pertenece al grupo de aprobación."
msgctxt "error:approval.request:"
msgctxt "model:ir.message,text:user_not_in_group"
msgid ""
"The user \"%(user)s\" cannot approve/reject the approval request "
"\"%(request)s\" because he isn't the user of the request."
@ -18,12 +18,12 @@ msgstr ""
"El usuario \"%(user)s\" no puede aprobar/rechazar la petición de aprobación "
"\"%(request)s\" porque no es el usuario de la petición."
msgctxt "error:approval.request:"
msgctxt "model:ir.message,text:delete_approved_rejected_request"
msgid ""
"You cannot delete the approval request \"%s\" because it isn't pending or "
"You cannot delete the approval request \"%(request)s\" because it isn't pending or "
"cancelled."
msgstr ""
"No puedes eliminar la petición de aprobación \"%s\" porque no está pendiente"
"No puedes eliminar la petición de aprobación \"%(request)s\" porque no está pendiente"
" o cancelada."
msgctxt "field:approval.group,create_date:"

19
message.xml Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0"?>
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<tryton>
<data group="1">
<record model="ir.message" id="forbidden_user">
<field name="text">The user \"%(user)s\" cannot approve/reject the approval request
\"%(request)s\" because he isn't in the request's Group.</field>
</record>
<record model="ir.message" id="user_not_in_group">
<field name="text">The user \"%(user)s\" cannot approve/reject the approval request
\"%(request)s\" because he isn't the user of the request.</field>
</record>
<record model="ir.message" id="delete_approved_rejected_request">
<field name="text">You cannot delete the approval request \"%(request)s\" because it isn't pending or
cancelled.</field>
</record>
</data>
</tryton>

2
setup.py
View File

@ -8,7 +8,7 @@ import io
try:
from configparser import ConfigParser
except ImportError:
from ConfigParser import ConfigParser
from configparser import ConfigParser
MODULE = 'approval'
PREFIX = 'nantic'

3
tryton.cfg
View File

@ -1,7 +1,8 @@
[tryton]
version=4.9.0
version=5.2.0
depends:
ir
res
xml:
approval.xml
message.xml