taskjuggler 3.5.0 → 3.6.0

data/lib/taskjuggler/TextParser/StackElement.rb

@@ -3,8 +3,8 @@
 #
 # = StackElement.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/TextParser/State.rb

@@ -3,8 +3,8 @@
 #
 # = State.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/TextParser/TokenDoc.rb

@@ -3,8 +3,8 @@
 #
 # = TokenDoc.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/TimeSheetReceiver.rb

@@ -3,8 +3,8 @@
 #
 # = TimeSheetReceiver.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/TimeSheetSender.rb

@@ -3,8 +3,8 @@
 #
 # = TimeSheetSender.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/TimeSheetSummary.rb

@@ -3,8 +3,8 @@
 #
 # = TimeSheetSummary.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -78,7 +78,7 @@ EOT
         templateFile = "#{@templateDir}/#{@date}/#{resourceId}_#{@date}.tji"
         sheetFile = "#{@sheetDir}/#{@date}/#{resourceId}_#{@date}.tji"
         if File.exist?(templateFile)
-          if File.exists?(sheetFile)
+          if File.exist?(sheetFile)
             # If there are no recipients specified, we don't need to compile
             # the summary.
             unless @digestRecipients.empty? && @sheetRecipients.empty?

data/lib/taskjuggler/TimeSheets.rb

@@ -3,8 +3,8 @@
 #
 # = TimeSheets.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/Tj3AppBase.rb

@@ -3,8 +3,8 @@
 #
 # = Tj3AppBase.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/Tj3Config.rb

@@ -3,8 +3,8 @@
 #
 # = Tj3Config.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -14,12 +14,12 @@
 require 'taskjuggler/UTF8String'
 require 'taskjuggler/AppConfig'
 
-AppConfig.version = '3.5.0'
+AppConfig.version = '3.6.0'
 AppConfig.packageName = 'taskjuggler'
 AppConfig.softwareName = 'TaskJuggler'
 AppConfig.packageInfo = 'A Project Management Software'
-AppConfig.copyright = [ (2006..2013).to_a ]
-AppConfig.authors = [ 'Chris Schlaeger <chris@linux.com>' ]
+AppConfig.copyright = [ (2006..2016).to_a ]
+AppConfig.authors = [ 'Chris Schlaeger <cs@taskjuggler.org>' ]
 AppConfig.contact = 'http://www.taskjuggler.org'
 AppConfig.license = <<'EOT'
 This program is free software; you can redistribute it and/or modify it under

data/lib/taskjuggler/Tj3SheetAppBase.rb

@@ -3,8 +3,8 @@
 #
 # = Tj3SheetAppBase.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/TjException.rb

@@ -3,8 +3,8 @@
 #
 # = TjException.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/TjTime.rb

@@ -3,8 +3,8 @@
 #
 # = TjTime.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/TjpExample.rb

@@ -3,8 +3,8 @@
 #
 # = TjpExample.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/TjpSyntaxRules.rb

@@ -3,8 +3,8 @@
 #
 # = TjpSyntaxRules.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -1030,6 +1030,10 @@ EOT
     descr('days')
   end
 
+  def rule_dynamicAttributes
+    pattern(%w( !reportAttributes . ))
+  end
+
   def rule_export
     pattern(%w( !exportHeader !exportBody ), lambda {
       @property = @property.parent
@@ -1191,7 +1195,9 @@ TaskJuggler manages assignments with a larger accuracy than the Microsft
 Project XML format can represent. This will inevitably lead to some rounding
 errors and different interpretation of the data. The numbers you will see in
 Project are not necessarily an exact match of the numbers you see in
-TaskJuggler.
+TaskJuggler. The XML file format requires the sequence of the tasks in the
+file to follow the work breakdown structure. Hence all user provided sorting
+directions will be ignored for this format.
 EOT
          )
   end
@@ -2303,7 +2309,8 @@ EOT
   end
 
   def rule_leaveAllowance
-    pattern(%w( _annual !valDate !optionalMinus !workingDuration ), lambda {
+    pattern(%w( _annual !valDate !optionalMinus
+                !nonZeroWorkingDuration ), lambda {
       LeaveAllowance.new(:annual, @val[1], (@val[2] ? -1 : 1) * @val[3])
     })
   end
@@ -2372,7 +2379,10 @@ EOT
     descr('Unpaid leave')
 
     singlePattern('_holiday')
-    descr('Public or bank holiday (highest priority)')
+    descr('Public or bank holiday')
+
+    singlePattern('_unemployed')
+    descr('Not employeed (highest priority)')
   end
 
   def rule_limitAttributes
@@ -2425,7 +2435,7 @@ EOT
   end
 
   def rule_limitValue
-    pattern([ '!workingDuration' ], lambda {
+    pattern([ '!nonZeroWorkingDuration' ], lambda {
       @limitInterval = ScoreboardInterval.new(@project['start'],
                                               @project['scheduleGranularity'],
                                               @project['start'], @project['end'])
@@ -3814,6 +3824,15 @@ height. This does not work well with rich text columns in some browsers. Some
 show a scrollbar for the compressed table cells, others don't. It is
 recommended, that you don't use rich text columns in conjuction with the chart
 column.
+EOT
+         )
+
+    singlePattern('_children')
+    descr(<<'EOT'
+A list of all direct sub elements.
+
+The list can be customized by the [[listitem.column|listitem]] and
+[[listtype.column|listtype]] attributes.
 EOT
          )
 
@@ -3877,7 +3896,8 @@ EOT
     descr(<<'EOT'
 The resources that have this resource assigned as manager.
 
-The list can be customized by the [[listitem.column|listitem]] attribute.
+The list can be customized by the [[listitem.column|listitem]] and
+[[listtype.column|listtype]] attribute.
 EOT
          )
 
@@ -3919,9 +3939,10 @@ symbols are used for <nowiki><dep></nowiki>.
 * '''<nowiki>]->]</nowiki>''': End-to-End dependency
 * '''<nowiki>[->]</nowiki>''': Start-to-End dependency
 
-The list can be customized by the [[listitem.column|listitem]] attribute.
-The dependency symbol can be generated via the ''''dependency'''' attribute
-inthe query, the target date via the ''''date'''' attribute.
+The list can be customized by the [[listitem.column|listitem]] and
+[[listtype.column]] attributes. The dependency symbol can be generated via
+the ''''dependency'''' attribute inthe query, the target date via the
+''''date'''' attribute.
 EOT
          )
 
@@ -3960,7 +3981,8 @@ EOT
     descr(<<'EOT'
 For resources this is the headcount number of the resource or resource group.
 For a single resource this is the [[efficiency]] rounded to the next integer.
-For a group it is the sum of the sub resources headcount.
+Resources that are marked as unemployed at the report start time are not
+counted. For a group it is the sum of the sub resources headcount.
 
 For tasks it's the number of different resources allocated to the task during
 the report interval. Resources are weighted with their rounded efficiencies.
@@ -3989,7 +4011,8 @@ A list of milestones that are a prerequiste for the current task. For
 container tasks it will also include the inputs of the child tasks. Inputs may
 not have any predecessors.
 
-The list can be customized by the [[listitem.column|listitem]] attribute.
+The list can be customized by the [[listitem.column|listitem]] and
+[[listtype.column|listtype]] attribute.
 EOT
          )
 
@@ -4025,7 +4048,8 @@ EOT
     descr(<<'EOT'
 A list of managers that the resource reports to.
 
-The list can be customized by the [[listitem.column|listitem]] attribute.
+The list can be customized by the [[listitem.column|listitem]] and
+[[listtype.column|listtype]] attributes.
 EOT
         )
 
@@ -4076,9 +4100,10 @@ are used
 * '''<nowiki>]->]</nowiki>''': End-to-End dependency
 * '''<nowiki>[->]</nowiki>''': Start-to-End dependency
 
-The list can be customized by the [[listitem.column|listitem]] attribute.
-The dependency symbol can be generated via the ''''dependency'''' attribute
-inthe query, the target date via the ''''date'''' attribute.
+The list can be customized by the [[listitem.column|listitem]] and
+[[listtype.column|listtype]] attributes.  The dependency symbol can be
+generated via the ''''dependency'''' attribute inthe query, the target date
+via the ''''date'''' attribute.
 EOT
          )
 
@@ -4095,7 +4120,8 @@ EOT
     descr(<<'EOT'
 All resources that have this resource assigned as a direct or indirect manager.
 
-The list can be customized by the [[listitem.column|listitem]] attribute.
+The list can be customized by the [[listitem.column|listitem]] and
+[[listtype.column|listtype]] attributes.
 EOT
          )
 
@@ -4103,7 +4129,8 @@ EOT
     descr(<<'EOT'
 A list of resources that are assigned to the task in the report time frame.
 
-The list can be customized by the [[listitem.column|listitem]] attribute.
+The list can be customized by the [[listitem.column|listitem]] and
+[[listtype.column|listtype]] attributes.
 EOT
          )
 
@@ -4111,7 +4138,8 @@ EOT
     descr(<<'EOT'
 The responsible people for this task.
 
-The list can be customized by the [[listitem.column|listitem]] attribute.
+The list can be customized by the [[listitem.column|listitem]] and
+[[listtype.column|listtype]] attributes.
 EOT
          )
 
@@ -4164,7 +4192,8 @@ A list of milestones that depend on the current task. For container tasks it
 will also include the targets of the child tasks. Targets may not have any
 follower tasks.
 
-The list can be customized by the [[listitem.column|listitem]] attribute.
+The list can be customized by the [[listitem.column|listitem]] and
+[[listtype.column|listtype]] attributes.
 EOT
          )
 
@@ -4758,7 +4787,7 @@ EOT
   end
 
   def rule_resourceList
-    listRule('moreResources', '!resourceId')
+    listRule('moreResources', '!undefResourceId')
   end
 
   def rule_resourceReport
@@ -5174,6 +5203,11 @@ EOT
     singlePattern('_asap')
   end
 
+  def rule_schedulingMode
+    singlePattern('_planning')
+    singlePattern('_projection')
+  end
+
   def rule_shift
     pattern(%w( !shiftHeader !shiftBody ), lambda {
       @property = @property.parent
@@ -5332,6 +5366,12 @@ EOT
       case args.length
       when 2
         # <attribute>.<up|down>
+        # We default to the top-level scenario.
+        if args[1] != 'up' && args[1]!= 'down'
+          error('sort_direction', "Sorting direction must be 'up' or 'down'",
+                @sourceFileInfo[0])
+        end
+
         scenario = -1
         direction = args[1] == 'up'
         attribute = args[0]
@@ -5359,6 +5399,30 @@ EOT
               '(without appended .up or .down) instead.',
               @sourceFileInfo[0])
       end
+      case @sortProperty
+      when :account
+        ps = @project.accounts
+      when :resource
+        ps = @project.resources
+      when :task
+        ps = @project.tasks
+      end
+      unless ps.knownAttribute?(attribute) ||
+        TableReport::calculated?(attribute)
+        error('sorting_unknown_attr',
+              "Sorting criterium '#{attribute} is not a known attribute.")
+      end
+      if scenario > 0 && !(ps.scenarioSpecific?(attribute) ||
+                           TableReport.scenarioSpecific?(attribute))
+        error('sorting_attr_scen_spec',
+              "Sorting criterium '#{attribute}' is not scenario specific " +
+              "but a scenario has been specified.")
+      elsif scenario == -1 && (ps.scenarioSpecific?(attribute) ||
+                               TableReport.scenarioSpecific?(attribute))
+        # If no scenario was specified but the attribute is scenario specific,
+        # we default to the top-level scenario.
+        scenario = 0
+      end
       [ attribute, direction, scenario ]
     })
     arg(0, 'criteria', <<'EOT'
@@ -5366,7 +5430,8 @@ The sorting criteria must consist of a property attribute ID. See [[columnid]]
 for a complete list of available attributes. The ID must be suffixed by '.up'
 or '.down' to determine the sorting direction. Optionally the ID may be
 prefixed with a scenario ID and a dot to determine the scenario that should be
-used for sorting. So, possible values are 'plan.start.up' or 'priority.down'.
+used for sorting. In case no scenario was specified, the top-level scenario is
+used. Example values are 'plan.start.up' or 'priority.down'.
 EOT
          )
   end
@@ -5396,8 +5461,14 @@ EOT
         )
   end
 
+  def rule_sortAccountsKeyword
+    pattern(%w( _sortaccounts ), lambda {
+      @sortProperty = :account
+    })
+  end
+
   def rule_sortAccounts
-    pattern(%w( _sortaccounts !sortCriteria ), lambda {
+    pattern(%w( !sortAccountsKeyword !sortCriteria ), lambda {
       @property.set('sortAccounts', @val[1])
     })
     doc('sortaccounts', <<'EOT'
@@ -5409,8 +5480,14 @@ EOT
        )
   end
 
+  def rule_sortResourcesKeyword
+    pattern(%w( _sortresources ), lambda {
+      @sortProperty = :resource
+    })
+  end
+
   def rule_sortResources
-    pattern(%w( _sortresources !sortCriteria ), lambda {
+    pattern(%w( !sortResourcesKeyword !sortCriteria ), lambda {
       @property.set('sortResources', @val[1])
     })
     doc('sortresources', <<'EOT'
@@ -5422,8 +5499,14 @@ EOT
        )
   end
 
+  def rule_sortTasksKeyword
+    pattern(%w( _sorttasks ), lambda {
+      @sortProperty = :task
+    })
+  end
+
   def rule_sortTasks
-    pattern(%w( _sorttasks !sortCriteria ), lambda {
+    pattern(%w( !sortTasksKeyword !sortCriteria ), lambda {
       @property.set('sortTasks', @val[1])
     })
     doc('sorttasks', <<'EOT'
@@ -5904,21 +5987,22 @@ EOT
       @taskDependency.gapDuration = @val[1]
     })
     doc('gapduration', <<'EOT'
-Specifies the minimum required gap between the end of a preceding task and the
-start of this task, or the start of a following task and the end of this task.
-This is calendar time, not working time. 7d means one week.
+Specifies the minimum required gap between the start or end of a preceding
+task and the start of this task, or the start or end of a following task and
+the end of this task. This is calendar time, not working time. 7d means one
+week.
 EOT
        )
 
-    pattern(%w( _gaplength !workingDuration ), lambda {
+    pattern(%w( _gaplength !nonZeroWorkingDuration ), lambda {
       @taskDependency.gapLength = @val[1]
     })
     doc('gaplength', <<'EOT'
-Specifies the minimum required gap between the end of a preceding task and the
-start of this task, or the start of a following task and the end of this task.
-This is working time, not calendar time. 7d means 7 working days, not one
-week. Whether a day is considered a working day or not depends on the defined
-working hours and global leaves.
+Specifies the minimum required gap between the start or end of a preceding
+task and the start of this task, or the start or end of a following task and
+the end of this task. This is working time, not calendar time. 7d means 7
+working days, not one week. Whether a day is considered a working day or not
+depends on the defined working hours and global leaves.
 EOT
        )
 
@@ -6287,6 +6371,42 @@ EOT
     example('Durations')
     also(%w( duration length ))
 
+    pattern(%w( _effortdone !workingDuration ), lambda {
+      @property['effortdone', @scenarioIdx] = @val[1]
+    })
+    level(:beta)
+    doc('effortdone', <<'EOT'
+Specifies how much effort of the task has already been completed. This can
+only be used for [[effort]] based tasks and only if the task is scheduled in
+[[schedulingmode|projection mode]]. No [[booking.task|bookings]] must be
+specified for the scenario.  TaskJuggler is unable to create exact bookings
+for the time period before the current date. All effort values prior to the
+current date will be reported as zero.
+
+This attribute forces the task to be scheduled in [[scheduling|ASAP mode]].
+The task must have a predetermined [[start]] date.
+EOT
+       )
+    also(%w( effort effortleft schedulingmode trackingscenario ))
+
+    pattern(%w( _effortleft !workingDuration ), lambda {
+      @property['effortleft', @scenarioIdx] = @val[1]
+    })
+    level(:beta)
+    doc('effortleft', <<'EOT'
+Specifies how much effort of the task is still not completed. This can
+only be used for [[effort]] based tasks and only if the task is scheduled in
+[[schedulingmode|projection mode]]. No [[booking.task|bookings]] must be
+specified for the scenario.  TaskJuggler is unable to create exact bookings
+for the time period before the current date. All effort values prior to the
+current date will be reported as zero.
+
+This attribute forces the task to be scheduled in [[scheduling|ASAP mode]].
+The task must have a predetermined [[start]] date.
+EOT
+       )
+    also(%w( effort effortdone schedulingmode trackingscenario ))
+
     pattern(%w( _end !valDate ), lambda {
       @property['end', @scenarioIdx] = @val[1]
       begin
@@ -6328,7 +6448,7 @@ EOT
 
     pattern(%w( !fail ))
 
-    pattern(%w( _length !workingDuration ), lambda {
+    pattern(%w( _length !nonZeroWorkingDuration ), lambda {
       setDurationAttribute('length', @val[1])
     })
     doc('length', <<'EOT'
@@ -6514,24 +6634,16 @@ EOT
        )
 
     pattern(%w( _scheduled ), lambda {
-      if (@property['milestone', @scenarioIdx] &&
-          @property['start', @scenarioIdx].nil? &&
-          @property['end', @scenarioIdx].nil?) ||
-         (!@property['milestone', @scenarioIdx] &&
-          (@property['start', @scenarioIdx].nil? ||
-           @property['end', @scenarioIdx].nil?))
-        error('not_scheduled',
-              "Task #{@property.fullId} is marked as scheduled but does not " +
-              'have a fixed start and end date.',
-              @sourceFileInfo[0], @property)
-      end
       @property['scheduled', @scenarioIdx] = true
     })
     doc('scheduled', <<'EOT'
-This is mostly for internal use. It specifies that the task should be ignored
-for scheduling in the scenario. This option only makes sense if you provide
-all resource [[booking.resource|bookings]] manually. Without booking
-statements, the task will be reported with 0 effort and no resources assigned.
+It specifies that the task can be ignored for scheduling in the scenario. This
+option only makes sense if you provide all resource
+[[booking.resource|bookings]] manually. Without booking statements, the task
+will be reported with 0 effort and no resources assigned. If the task is not a
+milestone, has no effort, length or duration criteria, the start and end date
+will be derived from the first and last booking in case those dates are not
+supplied.
 EOT
        )
 
@@ -6581,6 +6693,22 @@ from end to start.
 As a general rule, try to avoid ALAP tasks whenever possible. Have a close
 eye on tasks that have been switched implicitly to ALAP mode because the
 end attribute comes after the start attribute.
+EOT
+       )
+
+    pattern(%w( _schedulingmode !schedulingMode ), lambda {
+      @property['projectionmode', @scenarioIdx] = (@val[1] == 'projection')
+    })
+    level(:beta)
+    doc('schedulingmode', <<'EOT'
+The scheduling mode controls how the scheduler assigns resources to this task.
+In planning mode, resources are allocated before and after the current date.
+In projection mode, resources are only allocated after the current date. In
+this mode, any resource activity prior to the current date must be provided
+with [[booking.task|bookings]]. Alternatively, the [[effortdone]] or
+[[effortleft]] attribute can be used.
+
+This scheduling mode is automatically set to projection mode when the [[trackingscenario]] is set. However, the setting can be overwritten by using this attribute.
 EOT
        )
 
@@ -6614,7 +6742,7 @@ EOT
       @shiftAssignments = nil
     })
     doc('shifts.task', <<'EOT'
-Limits the working time for this task during the during the specified interval
+Limits the working time for this task during the specified interval
 to the working hours of the given shift. Multiple shifts can be defined, but
 shift intervals may not overlap. This is an additional working time
 restriction ontop of the working hours of the allocated resources. It does not
@@ -7042,6 +7170,10 @@ shows the tracked values over time will be generated. The CSV file may contain
 all kinds of values that are being tracked. Report formats that don't support
 a mix of different values will just show the values of the second column.
 
+The values in the CSV files are fixed units and cannot be formated. Effort
+values are always in resource-days. This allows other software to interpret
+the file without any need for additional context information.
+
 The HTML version generates SVG graphs that are embedded in the HTML page.
 These graphs are only visble if the web browser supports HTML5. This is true
 for the latest generation of browsers, but older browsers may not support this
@@ -7110,6 +7242,7 @@ EOT
     })
     arg(1, 'task', 'ID of the new task')
   end
+
   def rule_tsReportHeader
     pattern(%w( _timesheetreport !optionalID $STRING ), lambda {
       newReport(@val[1], @val[2], :timeSheet, @sourceFileInfo[0]) do
@@ -7121,7 +7254,8 @@ EOT
         end
         @property.set('scenarios', [ scenarioIdx ])
         # Show all tasks, sorted by seqno-up.
-        @property.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
+        @property.set('hideTask',
+                      LogicalExpression.new(LogicalOperation.new(0)))
         @property.set('sortTasks', [ [ 'seqno', true, -1 ] ])
         # Show all resources, sorted by seqno-up.
         @property.set('hideResource',
@@ -7320,6 +7454,13 @@ EOT
     arg(1, 'task', 'ID of an already existing task')
   end
 
+  def rule_undefResourceId
+    pattern(%w( $ID ), lambda {
+      (@resourceprefix.empty? ? '' : @resourceprefix + '.') + @val[0]
+    })
+    arg(0, 'resource', 'The ID of a defined resource')
+  end
+
   def rule_vacationName
     optional
     pattern(%w( $STRING )) # We just throw the name away
@@ -7476,6 +7617,19 @@ EOT
         'Weekday (sun - sat). It is included in the interval.')
   end
 
+  def rule_nonZeroWorkingDuration
+    pattern(%w( !workingDuration ), lambda {
+      slots = @val[0]
+      if slots <= 0
+        error('working_duration_too_small',
+              "Duration values must be at least " +
+              "#{@project['scheduleGranularity'] / 60} minutes " +
+              "(your timingresolution) long.")
+      end
+      slots
+    })
+  end
+
   def rule_workingDuration
     pattern(%w( !number !durationUnit ), lambda {
       convFactors = [ 60, # minutes