Cédric Krier pushed to branch branch/default at Tryton / Tryton


Commits:
313b8fbe by Juanjo Garcia at 2023-03-12T17:25:52+01:00
Check name of account move template keyword is valid identifier

Closes #12012
- - - - -
aebd04cf by Cédric Krier at 2023-03-12T17:27:11+01:00
Catch also syntax error when evaluate account move template
- - - - -


3 changed files:

- modules/account/exceptions.py
- modules/account/message.xml
- modules/account/move_template.py


Changes:

=====================================
modules/account/exceptions.py
=====================================
@@ -73,6 +73,10 @@
     pass
 
 
+class MoveTemplateKeywordValidationError(ValidationError):
+    pass
+
+
 class CancelWarning(UserWarning):
     pass
 


=====================================
modules/account/message.xml
=====================================
@@ -146,7 +146,9 @@
         <record model="ir.message" id="msg_move_template_expession_not_number">
             <field name="text">The value "%(value)s" of "%(expression)s" from 
template "%(template)s" is not a number.</field>
         </record>
-
+        <record model="ir.message" 
id="msg_move_template_keyword_name_not_identifier">
+            <field name="text">The keyword name "%(name)s" is not a valid 
identifier.</field>
+        </record>
         <record model="ir.message" id="msg_write_reconciliation">
             <field name="text">You cannot modify any reconciliation.</field>
         </record>


=====================================
modules/account/move_template.py
=====================================
@@ -15,7 +15,9 @@
 from trytond.wizard import (
     Button, StateAction, StateTransition, StateView, Wizard)
 
-from .exceptions import MoveTemplateExpressionError, PeriodNotFoundError
+from .exceptions import (
+    MoveTemplateExpressionError, MoveTemplateKeywordValidationError,
+    PeriodNotFoundError)
 
 
 class MoveTemplate(DeactivableMixin, ModelSQL, ModelView):
@@ -87,6 +89,17 @@
         super().__setup__()
         cls.__access__.add('move')
 
+    @classmethod
+    def validate(cls, keywords):
+        for keyword in keywords:
+            keyword.check_name()
+
+    def check_name(self):
+        if self.name and not self.name.isidentifier():
+            raise MoveTemplateKeywordValidationError(
+                gettext('account.msg_name_not_valid',
+                    name=self.name))
+
     @staticmethod
     def default_required():
         return False
@@ -207,7 +220,7 @@
         try:
             amount = simple_eval(decistmt(self.amount),
                 functions={'Decimal': Decimal}, names=values)
-        except InvalidExpression as e:
+        except (InvalidExpression, SyntaxError) as e:
             raise MoveTemplateExpressionError(
                 gettext('account.msg_move_template_invalid_expression',
                     expression=values,
@@ -287,7 +300,7 @@
         try:
             amount = simple_eval(decistmt(self.amount),
                 functions={'Decimal': Decimal}, names=values)
-        except InvalidExpression as e:
+        except (InvalidExpression, SyntaxError) as e:
             raise MoveTemplateExpressionError(
                 gettext('account.msg_template_invalid_expression',
                     expression=values,



View it on Heptapod: 
https://foss.heptapod.net/tryton/tryton/-/compare/beedd0c4aaf490955cab6908ec9fe10d3d2aa4c2...aebd04cfb1d6e4f7837316c800b0bbd0a01f951f

-- 
View it on Heptapod: 
https://foss.heptapod.net/tryton/tryton/-/compare/beedd0c4aaf490955cab6908ec9fe10d3d2aa4c2...aebd04cfb1d6e4f7837316c800b0bbd0a01f951f
You're receiving this email because of your account on foss.heptapod.net.


Reply via email to