diff --git a/workflow/engine/classes/class.calendar.php b/workflow/engine/classes/class.calendar.php
index 24c968d2b..31ddf7e50 100755
--- a/workflow/engine/classes/class.calendar.php
+++ b/workflow/engine/classes/class.calendar.php
@@ -839,20 +839,11 @@ class calendar extends CalendarDefinition
     		$finDate = date('Y-m-d H:i:s');
     	}
     
-    	$secondDuration = 0.00;
-    
-    	if ( (strtotime($iniDate)) < (strtotime($finDate)) ) {
-    		$timeIniDate = strtotime($iniDate);
-    		$timeFinDate = strtotime($finDate);
-    	} elseif ( (strtotime($finDate)) < (strtotime($iniDate)) ) {
-    		$timeIniDate = strtotime($finDate);
-    		$timeFinDate = strtotime($iniDate);
-    		$auxDate = $iniDate;
-    		$iniDate = $finDate;
-    		$finDate = $auxDate;
-    	} else {
-    		return $secondDuration;
-    	}
+        if ((strtotime($finDate)) <= (strtotime($iniDate))) {
+            return 0.00;
+        }
+	
+        $secondDuration = 0.00;
     
     	$finDate = $this->dashGetIniDate($finDate, $calendarData);
     	$newDate = $iniDate;
@@ -1047,4 +1038,4 @@ class calendar extends CalendarDefinition
     }
 
 }
-?>
\ No newline at end of file
+?>
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 21ee5cd01..f2c40ce46 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -860,6 +860,8 @@
     <column name="PRO_DEBUG" type="INTEGER" required="true" default="0"/>
     <column name="PRO_DYNAFORMS" type="LONGVARCHAR" required="false"/>
     <column name="PRO_DERIVATION_SCREEN_TPL" type="VARCHAR" size="128" default="" required="false"/>
+    <column name="PRO_COST" type="DECIMAL" size="7,2" required="false" default="0"/>
+    <column name="PRO_UNIT_COST" type="VARCHAR" size="50" required="false" default=""/>
     <validator column="PRO_TIMEUNIT">
       <rule name="validValues" value="WEEKS|MONTHS|DAYS|HOURS|MINUTES" message="Please select a valid Time Unit."/>
     </validator>
@@ -3065,7 +3067,7 @@
   </table>
 
   <table name="SESSION_STORAGE">
-  	<vendor type="mysql">
+    <vendor type="mysql">
         <parameter name="Name" value="SESSION_STORAGE"/>
         <parameter name="Engine" value="InnoDB"/>
         <parameter name="Version" value="10"/>
@@ -3595,7 +3597,7 @@
   </table>
 
   <table name="BPMN_FLOW">
-  	<vendor type="mysql">
+    <vendor type="mysql">
       <parameter name="Name" value="BPMN_FLOW"/>
       <parameter name="Engine" value="InnoDB"/>
       <parameter name="Version" value="10"/>
@@ -3644,7 +3646,7 @@
   </table>
 
   <table name="BPMN_GATEWAY">
-  	<vendor type="mysql">
+    <vendor type="mysql">
       <parameter name="Name" value="BPMN_GATEWAY"/>
       <parameter name="Engine" value="InnoDB"/>
       <parameter name="Version" value="10"/>
@@ -3722,7 +3724,7 @@
   </table>
 
   <table name="BPMN_LANE">
-  	<vendor type="mysql">
+    <vendor type="mysql">
       <parameter name="Name" value="BPMN_LANE"/>
       <parameter name="Engine" value="InnoDB"/>
       <parameter name="Version" value="10"/>
@@ -3817,7 +3819,7 @@
   </table>
 
   <table name="BPMN_DOCUMENTATION">
-  	<vendor type="mysql">
+    <vendor type="mysql">
       <parameter name="Name" value="BPMN_DOCUMENTATION"/>
       <parameter name="Engine" value="InnoDB"/>
       <parameter name="Version" value="10"/>
@@ -4864,6 +4866,8 @@
         <column name="CONFIGURED_TASK_TIME" type="DECIMAL"  size="7,2"  default="0" />
         <column name="TOTAL_CASES_OVERDUE"  type="DECIMAL"  size="7,2"  default="0" />
         <column name="TOTAL_CASES_ON_TIME"  type="DECIMAL"  size="7,2"  default="0" />
+        <column name="PRO_COST"             type="DECIMAL"  size="7,2"  required="false" default="0"/>
+        <column name="PRO_UNIT_COST"        type="VARCHAR"  size="50"   required="false" default=""/>
         <index name="indexReporting">
             <index-column name="USR_UID"/>
             <index-column name="TAS_UID"/>
@@ -4911,6 +4915,8 @@
         <column name="TOTAL_CASES_OPEN"         type="DECIMAL"  size="7,2"  default="0" />
         <column name="TOTAL_CASES_OVERDUE"      type="DECIMAL"  size="7,2"  default="0" />
         <column name="TOTAL_CASES_ON_TIME"      type="DECIMAL"  size="7,2"  default="0" />
+        <column name="PRO_COST"                 type="DECIMAL"  size="7,2"  required="false" default="0"/>
+        <column name="PRO_UNIT_COST"            type="VARCHAR"  size="50"   required="false" default=""/>
     </table>
 
     <table name="DASHBOARD">
@@ -5049,4 +5055,3 @@
         </index>
     </table>
 </database>
-