046

nh_activity/activity.py

@@ -125,7 +125,8 @@ def _get_data_type_selection(self, cr, uid, context=None):
             'Termination Time', help="Completed, Aborted, Expired, Cancelled",
             readonly=True),
         'effective_date_terminated': fields.datetime(
-            'Effective Termination Time', help="Completed, Aborted, Expired, Cancelled",
+            'Effective Date (ONLY CHANGE EFFECTIVE TIME IF NEEDED - Observation times can only be back-dated by 8 hours)',
+            help="Completed, Aborted, Expired, Cancelled",
             readonly=True),
         # dates limits
         'date_deadline': fields.datetime('Deadline Time', readonly=True),

nh_clinical/api.py

@@ -350,8 +350,5 @@ def check_activity_access(self, cr, uid, activity_id, context=None):
         activity_ids = activity_pool.search(cr, uid, domain, context=context)
         if not activity_ids:
             return False
-        user_id = activity_pool.read(
-            cr, uid, activity_id, ['user_id'], context=context)['user_id']
-        if user_id and user_id[0] != uid:
-            return False
+
         return True

nh_eobs_mobile/controllers/main.py

@@ -715,6 +715,8 @@ def _find_next_ews_obs(patient_id):
                     break
                 except ValueError:
                     pass
+                except KeyError:
+                    pass
 
         cr, uid, context = request.cr, request.session.uid, request.context
         obj_nh_activity = request.registry['nh.activity']