merge

setup.py

@@ -47,4 +47,11 @@ setup(name=PACKAGE,
         'egenix-mx-base',
         'relatorio >= 0.2.0',
     ],
+    extras_require={
+        'WebDAV': ['PyWebDAV'],
+        'PDF': ['openoffice.interact'],
+        'SSL': ['pyOpenSSL'],
+        'graphviz': ['pydot'],
+        'timezone': ['pytz'],
+    },
 )

trytond/ir/ui/menu.py

@@ -81,7 +81,7 @@ class UIMenu(OSV):
     childs = fields.One2Many('ir.ui.menu', 'parent','Childs')
     parent = fields.Many2One('ir.ui.menu', 'Parent Menu', select=1)
     groups = fields.Many2Many('res.group', 'ir_ui_menu_group_rel',
-       'menu_id', 'gid', 'Groups')
+       'menu_id', 'gid', 'Groups', ondelete_target='CASCADE')
     complete_name = fields.Function('get_full_name',
        string='Complete Name', type='char', order_field='name')
     icon = fields.Selection(ICONS, 'Icon')

trytond/tools/convert.py

@@ -854,8 +854,9 @@ def post_import(cursor, pool, module, to_delete):
                     'There should be some relation ' \
                     'that points to this resource\n' \
                     'You should manually fix this ' \
-                    'and restart --update=module' % \
-                    (db_id, model))
+                    'and restart --update=module\n' \
+                    'Exception: %s' % \
+                    (db_id, model, str(exception)))
 
     transition_obj = pool.get('workflow.transition')
     for mdata_id, db_id in transition_delete:

trytond/wkf_service/workitem.py

@@ -100,17 +100,17 @@ def _execute(cursor, workitem, activity, ident):
                         str(type(id_new))
                 cursor.execute('SELECT id FROM wkf_instance ' \
                         'WHERE res_id = %s AND workflow = %s',
-                        (id_new, activity['subflow_id']))
+                        (id_new, activity['subflow']))
                 (id_new,) = cursor.fetchone()
             else:
-                id_new = instance.create(cursor, ident, activity['subflow_id'])
+                id_new = instance.create(cursor, ident, activity['subflow'])
             cursor.execute('UPDATE wkf_workitem ' \
                     'SET subflow = %s WHERE id = %s',
                     (id_new, workitem['id']))
-            workitem['subflow_id'] = id_new
+            workitem['subflow'] = id_new
         if workitem['state'] == 'running':
             cursor.execute("SELECT state FROM wkf_instance " \
-                    "WHERE id = %s", (workitem['subflow_id'],))
+                    "WHERE id = %s", (workitem['subflow'],))
             (state,) = cursor.fetchone()
             if state == 'complete':
                 _state_set(cursor, workitem, 'complete')

trytond/workflow/workflow.py

@@ -66,10 +66,16 @@ class WorkflowActivity(OSV):
        ('subflow', 'Subflow'),
        ('stopall', 'Stop All'),
        ], 'Kind', required=True)
-    action = fields.Char('Action')
+    action = fields.Text('Action', states={
+        'readonly': "kind == 'dummy'",
+        'required': "kind == 'function'",
+        })
     flow_start = fields.Boolean('Flow Start')
     flow_stop = fields.Boolean('Flow Stop')
-    subflow =  fields.Many2One('workflow', 'Subflow')
+    subflow =  fields.Many2One('workflow', 'Subflow', states={
+        'readonly': "kind != 'subflow'",
+        'required': "kind == 'subflow'",
+        })
     signal_send = fields.Char('Signal (subflow.*)')
     out_transitions = fields.One2Many('workflow.transition', 'act_from',
        'Outgoing transitions')