Merge lp:~openerp-dev/openobject-server/trunk-bug-1035976-tpa into lp:openobject-server

[Turkesh Patel (openERP)]

[FIX] Workflow function activities explode if they contain empty lines.

[Vo Minh Thu (thu)]

You can call continue after the line=line.strip() when the line is empty, so it would even work for blank lines.

review: Needs Fixing

[Vo Minh Thu (thu)]

B.t.w. I think you can use filter(None, action.split('\n') (i.e. None instead of the lambda).

[Turkesh Patel (openERP) (turkesh-tinyerp)]

Improved code as per your last comment.

[lp:~openerp-dev/openobject-server/trunk-bug-1035976-tpa]

4396. By Vo Minh Thu on 2012-11-28

[IMP] wkf_expr: Ignore empty lines and lines with blanks.

4397. By Vo Minh Thu on 2012-11-28

[MERGE] merged trunk.

=== modified file 'openerp/workflow/wkf_expr.py'
--- openerp/workflow/wkf_expr.py	2011-09-14 10:25:05 +0000
+++ openerp/workflow/wkf_expr.py	2012-11-28 15:22:22 +0000
@@ -46,6 +46,8 @@
     assert action, 'You used a NULL action in a workflow, use dummy node instead.'
     for line in action.split('\n'):
         line = line.strip()
+        if not line:
+            continue
         uid=ident[0]
         model=ident[1]
         ids=[ident[2]]