Index: openacs-4/packages/xolp/tcl/xolp-activity-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xolp/tcl/xolp-activity-procs.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/xolp/tcl/xolp-activity-procs.tcl	12 Apr 2019 12:09:58 -0000	1.6
+++ openacs-4/packages/xolp/tcl/xolp-activity-procs.tcl	12 Apr 2019 12:35:21 -0000	1.7
@@ -153,7 +153,7 @@
     {-package_url ""}
     {-begin_timestamp ""}
     {-end_timestamp ""}
-    {-scd_valid_from "NOW()"}
+    {-scd_valid_from "current_timespamp"}
     args
   } {
     @return Instance of ::xolp::Activity
@@ -190,7 +190,7 @@
       set old [:current -iri $iri]
       set scd_valid_to_new [::xo::dc get_value roll-step1 "
         UPDATE xolp_activity_dimension
-        SET scd_valid_to = NOW()
+        SET scd_valid_to = current_timestamp
         WHERE activity_version_id = [$old activity_version_id]
         RETURNING scd_valid_to + INTERVAL '0.000001' SECOND
       "]
Index: openacs-4/packages/xolp/tcl/xolp-indicator-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xolp/tcl/xolp-indicator-procs.tcl,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/xolp/tcl/xolp-indicator-procs.tcl	12 Apr 2019 12:09:58 -0000	1.10
+++ openacs-4/packages/xolp/tcl/xolp-indicator-procs.tcl	12 Apr 2019 12:35:21 -0000	1.11
@@ -61,13 +61,13 @@
     activity_verb_id      {INTEGER NOT NULL REFERENCES xolp_activity_verb_dimension}
     activity_version_id   {INTEGER NOT NULL REFERENCES xolp_activity_dimension ON DELETE CASCADE}
     competency_set_id     {INTEGER DEFAULT 1 NOT NULL REFERENCES xolp_competency_set_dimension ON DELETE SET DEFAULT}
-    begin_timestamp       {TIMESTAMP WITH TIME ZONE DEFAULT NOW() NOT NULL CHECK (begin_timestamp <= end_timestamp)}
+    begin_timestamp       {TIMESTAMP WITH TIME ZONE DEFAULT current_timestamp NOT NULL CHECK (begin_timestamp <= end_timestamp)}
     begin_date_id         {INTEGER NOT NULL REFERENCES xolp_date_dimension}
     begin_time_id         {INTEGER NOT NULL REFERENCES xolp_time_dimension}
-    end_timestamp         {TIMESTAMP WITH TIME ZONE DEFAULT NOW() NOT NULL}
+    end_timestamp         {TIMESTAMP WITH TIME ZONE DEFAULT current_timestamp NOT NULL}
     end_date_id           {INTEGER NOT NULL REFERENCES xolp_date_dimension}
     end_time_id           {INTEGER NOT NULL REFERENCES xolp_time_dimension}
-    storage_timestamp     {TIMESTAMP WITH TIME ZONE DEFAULT NOW() NOT NULL CHECK (end_timestamp <= storage_timestamp)}
+    storage_timestamp     {TIMESTAMP WITH TIME ZONE DEFAULT current_timestamp NOT NULL CHECK (end_timestamp <= storage_timestamp)}
     storage_date_id       {INTEGER NOT NULL REFERENCES xolp_date_dimension}
     storage_time_id       {INTEGER NOT NULL REFERENCES xolp_time_dimension}
     result_numerator      {INTEGER NOT NULL}