taskjuggler 3.0.0 → 3.1.0

data/lib/taskjuggler/LeaveList.rb

@@ -0,0 +1,103 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = LeaveList.rb -- The TaskJuggler III Project Management Software
+#
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+#               by Chris Schlaeger <chris@linux.com>
+#
+# 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
+# published by the Free Software Foundation.
+#
+
+class TaskJuggler
+
+  # This class describes a leave.
+  class Leave
+
+    attr_reader :interval, :type, :reason
+
+    # This Hash defines the supported leave types. It maps the symbol to its
+    # index. The index sequence is important when multiple leaves are defined
+    # for the same time slot. A subsequent definition with a type with a
+    # larger index will override the old leave type.
+    Types = {
+      :project => 1,
+      :annual => 2,
+      :special => 3,
+      :sick => 4,
+      :unpaid => 5,
+      :holiday => 6
+    }
+
+    # Create a new Leave object. _interval_ should be an Interval describing
+    # the leave period. _type_ must be one of the supported leave types
+    # (:holiday, :annual, :special, :unpaid, :sick and :project ). The
+    # _reason_ is an optional String that describes the leave reason.
+    def initialize(type, interval, reason = nil)
+      unless Types[type]
+        raise ArgumentError, "Unsupported leave type #{type}"
+      end
+      @type = type
+      @interval = interval
+      @reason = reason
+    end
+
+    def typeIdx
+      Types[@type]
+    end
+
+    def to_s
+      "#{@type} #{@description ? "\"#{@description}\"" : ""} #{@interval}"
+    end
+
+  end
+
+  # A list of leaves.
+  class LeaveList < Array
+
+    def initialize(*args)
+      super(*args)
+    end
+
+  end
+
+  class LeaveAllowance < Struct.new(:type, :date, :slots)
+
+    def initialize(type, date, slots)
+      unless Leave::Types[type]
+        raise ArgumentError, "Unsupported leave type #{type}"
+      end
+      super
+    end
+
+  end
+
+  # The LeaveAllowanceList can store lists of LeaveAllowance objects.
+  # Allowances are counted in time slots and can be negative to substract
+  # expired allowances.
+  class LeaveAllowanceList < Array
+
+    # Create a new empty LeaveAllowanceList.
+    def initialize(*args)
+      super(*args)
+    end
+
+    def balance(type, startDate, endDate)
+      unless Leave::Types[type]
+        raise ArgumentError, "Unsupported leave type #{type}"
+      end
+
+      balance = 0.0
+      each do |al|
+        balance += al.slots if al.type == type && al.date >= startDate &&
+                               al.date < endDate
+      end
+      balance
+    end
+
+  end
+
+end
+

data/lib/taskjuggler/Limits.rb

@@ -3,7 +3,7 @@
 #
 # = Limits.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/Log.rb

@@ -3,7 +3,7 @@
 #
 # = Log.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -13,6 +13,7 @@
 
 require 'singleton'
 require 'monitor'
+require 'term/ansicolor'
 
 class TaskJuggler
 
@@ -133,7 +134,8 @@ class TaskJuggler
     def Log.stopProgressMeter
       return if @@silent
 
-      $stdout.print("#{@@progressMeter} [      Done      ]\n")
+      $stdout.print("#{@@progressMeter} [      " +
+                    Term::ANSIColor.green("Done") + "      ]\n")
     end
 
     # This function may only be called when Log#startProgressMeter has been
@@ -162,7 +164,8 @@ class TaskJuggler
       bar = '=' * full + ' ' * (length - full)
       label = (percent * 100.0).to_i.to_s + '%'
       bar[length / 2 - label.length / 2, label.length] = label
-      $stdout.print("#{@@progressMeter} [#{bar}]\r")
+      $stdout.print("#{@@progressMeter} [" +
+                    Term::ANSIColor.green("#{bar}") + "]\r")
     end
 
   end

data/lib/taskjuggler/LogFile.rb

@@ -3,7 +3,7 @@
 #
 # = LogFile.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/LogicalExpression.rb

@@ -3,7 +3,7 @@
 #
 # = LogicalExpression.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/LogicalFunction.rb

@@ -3,7 +3,7 @@
 #
 # = LogicalFunction.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -34,6 +34,7 @@ class TaskJuggler
         'ismilestone' => 1,
         'isongoing' => 1,
         'isresource' => 0,
+        'isresponsibilityof' => 2,
         'istask' => 0,
         'treelevel' => 0
     }
@@ -114,7 +115,7 @@ class TaskJuggler
       end
 
       query = expr.query
-      property.getAllocatedTime(scenarioIdx, query.start, query.end,
+      property.getAllocatedTime(scenarioIdx, query.startIdx, query.endIdx,
                                 scopeProperty) > 0.0
     end
 
@@ -211,6 +212,19 @@ class TaskJuggler
       property.is_a?(Resource)
     end
 
+    def isresponsibilityof(expr, args)
+      property = properties(expr)[0]
+      # The result can only be true when called for a Task property.
+      return false unless (task = property).is_a?(Task)
+      project = task.project
+      # 1st arg must be a resource ID.
+      return false if (resource = project.resource(args[0])).nil?
+      # 2nd arg must be a scenario index.
+      return false if (scenarioIdx = project.scenarioIdx(args[1])).nil?
+
+      task['responsible', scenarioIdx].include?(resource)
+    end
+
     def istask(expr, args)
       property = properties(expr)[0]
       return false unless property

data/lib/taskjuggler/LogicalOperation.rb

@@ -3,7 +3,7 @@
 #
 # = LogicalOperation.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -11,6 +11,8 @@
 # published by the Free Software Foundation.
 #
 
+require 'taskjuggler/TjTime'
+require 'taskjuggler/RichText'
 require 'taskjuggler/TjException'
 
 class TaskJuggler

data/lib/taskjuggler/MessageHandler.rb

@@ -3,7 +3,7 @@
 #
 # = MessageHandler.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -11,6 +11,11 @@
 # published by the Free Software Foundation.
 #
 
+if RUBY_VERSION < "1.9.0"
+  require 'rubygems'
+end
+
+require 'term/ansicolor'
 require 'taskjuggler/TextParser/SourceFileInfo'
 
 class TaskJuggler
@@ -19,6 +24,8 @@ class TaskJuggler
   # application can send out.
   class Message
 
+    include Term::ANSIColor
+
     attr_reader :type, :id, :message, :sourceFileInfo, :line
 
     # Create a new Message object.  The _type_ specifies what tpye of message
@@ -69,11 +76,13 @@ class TaskJuggler
         str += "#{@sourceFileInfo.fileName}:#{sourceFileInfo.lineNo}: "
       end
       if @scenario
-        str += "#{@type.to_s.capitalize} in scenario #{@scenario.id}: "
+        tag = "#{@type.to_s.capitalize} in scenario #{@scenario.id}: "
       else
-        str += "#{@type.to_s.capitalize}: "
+        tag = "#{@type.to_s.capitalize}: "
       end
-      str += @message
+      colors = { :fatal => red, :error => red, :warning => magenta,
+                 :info => blue, :debug => green }
+      str += colors[@type] + tag + @message + reset
       str += "\n" + @line if @line
       str
     end

data/lib/taskjuggler/PTNProxy.rb

@@ -0,0 +1,118 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = PTNProxy.rb -- The TaskJuggler III Project Management Software
+#
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+#               by Chris Schlaeger <chris@linux.com>
+#
+# 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
+# published by the Free Software Foundation.
+#
+
+class TaskJuggler
+
+  # This class provides objects that represent PropertyTreeNode objects that
+  # were adopted (directly or indirectly) in their new parental context. Such
+  # objects are used as elements of a PropertyList which can only hold each
+  # PropertyTreeNode objects once. By using this class, we can add such
+  # objects more than once, each time with a new parental context that was
+  # created by an adoption.
+  class PTNProxy
+
+    attr_reader :parent
+
+    def initialize(ptn, parent)
+      @ptn = ptn
+      raise "Adopted classes must have a parent" unless parent
+      @parent = parent
+      @indext =  nil
+      @tree = nil
+      @level = -1
+    end
+
+    def set(attribute, val)
+      if attribute == 'index'
+        @index = val
+      elsif attribute == 'tree'
+        @tree = val
+      else
+        @ptn.set(attribute, val)
+      end
+    end
+
+    def get(attribute)
+      if attribute == 'index'
+        @index
+      elsif attribute == 'tree'
+        @tree
+      else
+        @ptn.get(attribute)
+      end
+    end
+
+    def [](attribute, scenarioIdx)
+      if attribute == 'index'
+        @index
+      elsif attribute == 'tree'
+        @tree
+      else
+        @ptn[attribute, scenarioIdx]
+      end
+    end
+
+    # Returns the level that this property is on. Top-level properties return
+    # 0, their children 1 and so on. This value is cached internally, so it does
+    # not have to be calculated each time the function is called.
+    def level
+      return @level if @level >= 0
+
+      t = self
+      @level = 0
+      until (t = t.parent).nil?
+        @level += 1
+      end
+      @level
+    end
+
+    # Find out if this property is a direct or indirect child of _ancestor_.
+    def isChildOf?(ancestor)
+      parent = self
+      while parent = parent.parent
+        return true if (parent == ancestor)
+      end
+      false
+    end
+
+    # Return the 'index' attributes of this property, prefixed by the 'index'
+    # attributes of all its parents. The result is an Array of Fixnums.
+    def getIndicies
+      idcs = []
+      p = self
+      begin
+        parent = p.parent
+        idcs.insert(0, p.get('index'))
+        p = parent
+      end while p
+      idcs
+    end
+
+    def method_missing(func, *args, &block)
+      @ptn.send(func, *args, &block)
+    end
+
+    alias_method :respond_to_?, :respond_to?
+
+    def respond_to?(method)
+      respond_to_?(method) || @ptn.respond_to?(method)
+    end
+
+    def is_a?(type)
+      @ptn.is_a?(type)
+    end
+
+  end
+
+end
+

data/lib/taskjuggler/Project.rb

@@ -3,7 +3,7 @@
 #
 # = Project.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -15,7 +15,11 @@ require 'taskjuggler/TjException'
 require 'taskjuggler/MessageHandler'
 require 'taskjuggler/FileList'
 require 'taskjuggler/TjTime'
+require 'taskjuggler/AlertLevelDefinitions'
+require 'taskjuggler/AccountCredit'
 require 'taskjuggler/Booking'
+require 'taskjuggler/DataCache'
+require 'taskjuggler/LeaveList'
 require 'taskjuggler/PropertySet'
 require 'taskjuggler/Attributes'
 require 'taskjuggler/RealFormat'
@@ -67,10 +71,7 @@ class TaskJuggler
         # Currently, these levels are hardcoded. Each level entry has 3
         # members: the tjp syntax token, the user visible name and the
         # associated color as RGB byte array.
-        'alertLevels' => [
-          [ 'green',  'Green',  '#008000' ],
-          [ 'yellow', 'Yellow', '#BEA800' ],
-          [ 'red',    'Red',    '#C00000' ] ],
+        'alertLevels' => AlertLevelDefinitions.new,
         'copyright' => nil,
         'costAccount' => nil,
         'currency' => "EUR",
@@ -80,6 +81,7 @@ class TaskJuggler
         'flags' => [],
         'journal' => Journal.new,
         'limits' => nil,
+        'leaves' => LeaveList.new,
         'loadUnit' => :days,
         'name' => name,
         'navigators' => {},
@@ -96,7 +98,6 @@ class TaskJuggler
         'timeFormat' => "%Y-%m-%d",
         'timezone' => TjTime.timeZone,
         'trackingScenarioIdx' => nil,
-        'vacations' => [],
         'version' => version || "1.0",
         'weekStartsMonday' => true,
         'workinghours' => nil,
@@ -134,24 +135,24 @@ class TaskJuggler
       attrs = [
         # ID           Name            Type
         #     Inh.   Inh.Prj  Scen.  Default
-        [ 'bsi',      'BSI',          StringAttribute,
+        [ 'bsi',      'BSI',           StringAttribute,
               false, false,   false, "" ],
-        [ 'id',       'ID',         StringAttribute,
+        [ 'id',       'ID',            StringAttribute,
               false, false,   false, nil ],
         [ 'index',     'Index',        FixnumAttribute,
               false, false,   false, -1 ],
-        [ 'name',     'Name',       StringAttribute,
+        [ 'leaves',    'Leaves',       LeaveListAttribute,
+              true,  true,    true,  LeaveList.new ],
+        [ 'name',     'Name',          StringAttribute,
               false, false,   false, nil ],
         [ 'replace',   'Replace',      BooleanAttribute,
               true,  false,   true,  false ],
-        [ 'seqno',    'No',          FixnumAttribute,
+        [ 'seqno',    'No',            FixnumAttribute,
               false, false,   false, nil ],
         [ 'timezone',  'Time Zone',    StringAttribute,
               true,  true,    true,  TjTime.timeZone ],
         [ 'tree',      'Tree Index',   StringAttribute,
               false, false,   false, "" ],
-        [ 'vacations', 'Vacations',    TimeIntervalListAttribute,
-              true,  true,    true,  [] ],
         [ 'workinghours', 'Working Hours', WorkingHoursAttribute,
               true,  true,    true,  nil ]
       ]
@@ -161,8 +162,12 @@ class TaskJuggler
       attrs = [
         # ID           Name            Type
         #     Inh.   Inh.Prj  Scen.  Default
+        [ 'aggregate', 'Aggregate',    SymbolAttribute,
+              true,  false,   false, :tasks ],
         [ 'bsi',       'BSI',          StringAttribute,
               false, false,   false, "" ],
+        [ 'credits',   'Credits',      AccountCreditListAttribute,
+              false, false,   true,  [] ],
         [ 'id',       'ID',         StringAttribute,
               false, false,   false, nil ],
         [ 'index',     'Index',        FixnumAttribute,
@@ -186,6 +191,8 @@ class TaskJuggler
               false, false,   true,  0.0 ],
         [ 'bsi',       'BSI',          StringAttribute,
               false, false,   false, "" ],
+        [ 'chargeset', 'Charge Sets',  ChargeSetListAttribute,
+              true,  false,   true,  [] ],
         [ 'criticalness', 'Criticalness', FloatAttribute,
               false, false,   true,  0.0 ],
         [ 'duties',    'Duties',       TaskListAttribute,
@@ -202,10 +209,12 @@ class TaskJuggler
               false, false,   false,  [] ],
         [ 'flags',     'Flags',        FlagListAttribute,
               true,  false,   true,  [] ],
-        [ 'headcount', 'Headcount',    FixnumAttribute,
-              false, false,   true,  1 ],
         [ 'index',     'Index',        FixnumAttribute,
               false, false,   false, -1 ],
+        [ 'leaveallowances', 'Leave Allowances', LeaveAllowanceListAttribute,
+              true,  false,   true,  LeaveAllowanceList.new ],
+        [ 'leaves',    'Leaves',       LeaveListAttribute,
+              true,  true,    true,  LeaveList.new ],
         [ 'limits',    'Limits',       LimitsAttribute,
               true,  true,    true,  nil ],
         [ 'managers', 'Managers',      ResourceListAttribute,
@@ -220,8 +229,6 @@ class TaskJuggler
               true, false,    true,  nil ],
         [ 'tree',      'Tree Index',   StringAttribute,
               false, false,   false, "" ],
-        [ 'vacations',  'Vacations',   TimeIntervalListAttribute,
-              true,  true,    true,  [] ],
         [ 'warn',      'Warning Condition', LogicalExpressionListAttribute,
               false, false,   false, [] ],
         [ 'workinghours', 'Working Hours', WorkingHoursAttribute,
@@ -267,6 +274,8 @@ class TaskJuggler
               true,  false,   true,  [] ],
         [ 'forward',   'Scheduling',   BooleanAttribute,
               true,  false,   true,  true ],
+        [ 'gauge',     'Schedule gauge', StringAttribute,
+              false, false,   true,  nil ],
         [ 'id',       'ID',         StringAttribute,
               false, false,   false, nil ],
         [ 'index',     'Index',        FixnumAttribute,
@@ -324,6 +333,8 @@ class TaskJuggler
       attrs = [
         # ID           Name            Type
         #     Inh.   Inh.Prj  Scen.  Default
+        [ 'accountRoot',  'Account Root',    PropertyAttribute,
+              true,  false,   false, nil ],
         [ 'bsi',       'BSI',          StringAttribute,
               false, false,   false, "" ],
         [ 'caption',   'Caption',      RichTextAttribute,
@@ -354,6 +365,8 @@ class TaskJuggler
               true,  false,   false, nil ],
         [ 'headline',  'Headline',     RichTextAttribute,
               true,  false,   false, nil ],
+        [ 'hideAccount', 'Hide Account', LogicalExpressionAttribute,
+              true,  false,   false, nil ],
         [ 'hideJournalEntry', 'Hide JournalEntry', LogicalExpressionAttribute,
               true,  false,   false, nil ],
         [ 'hideResource', 'Hide Resource', LogicalExpressionAttribute,
@@ -392,6 +405,8 @@ class TaskJuggler
               true,  true,    false, nil ],
         [ 'right',     'Right',        RichTextAttribute,
               true,  false,   false, nil ],
+        [ 'rollupAccount', 'Rollup Account', LogicalExpressionAttribute,
+              true,  false,   false, nil ],
         [ 'rollupResource', 'Rollup Resource', LogicalExpressionAttribute,
               true,  false,   false, nil ],
         [ 'rollupTask', 'Rollup Task', LogicalExpressionAttribute,
@@ -404,6 +419,8 @@ class TaskJuggler
               false, false,   false, nil ],
         [ 'shortTimeFormat', 'Short Time Format', StringAttribute,
               true,  true,    false, nil ],
+        [ 'sortAccounts', 'Sort Accounts', SortListAttribute,
+              true,  false,   false, [[ 'seqno', true, -1 ]] ],
         [ 'sortJournalEntries', 'Sort Journal Entries', JournalSortListAttribute,
               true,  false,   false, [[ :alert, 1 ], [ :date, 1 ], [ :seqno, 1 ]] ],
         [ 'sortResources', 'Sort Resources', SortListAttribute,
@@ -440,10 +457,10 @@ class TaskJuggler
 
       @timeSheets = TimeSheets.new
 
-      # A scoreboard that reflects the global working hours and vacations.
+      # A scoreboard that reflects the global working hours and leaves.
       @scoreboard = nil
-      # A scoreboard that reflects the global working hours but no vacations.
-      @scoreboardNoVacations = nil
+      # A scoreboard that reflects the global working hours but no leaves.
+      @scoreboardNoLeaves = nil
 
       # The ReportContext provides additional settings to the report that can
       # complement or replace the report attributes. Reports can include other
@@ -495,48 +512,15 @@ class TaskJuggler
       @scenarios.items
     end
 
-    # Try to match _levelName_ to a defined alert level name and return the
-    # index of it. If no level is found, nil is returned.
-    def alertLevelIndex(levelName)
-      @attributes['alertLevels'].length.times do |i|
-        if @attributes['alertLevels'][i][0] == levelName
-          return i
-        end
-      end
-      nil
-    end
-
-    # Return the ID or keyword of the alert level with the given _levelIndex_.
-    # Or nil if the level does not exist.
-    def alertLevelId(levelIndex)
-      return 'unknown' unless @attributes['alertLevels'][levelIndex]
-      @attributes['alertLevels'][levelIndex][0]
-    end
-
-    # Return the user readable name of the alert level with the given
-    # _levelIndex_. Or nil if the level does not exist.
-    def alertLevelName(levelIndex)
-      return 'unknown' unless @attributes['alertLevels'][levelIndex]
-      @attributes['alertLevels'][levelIndex][1]
-    end
-
-    # Return the color of the alert level with the given _levelIndex_. Or nil
-    # if the level does not exist. The color is an RGB encoded byte array,
-    # stored as hexadecimal String, prefixed with a pound sign.
-    def alertLevelColor(levelIndex)
-      return 'unknown' unless @attributes['alertLevels'][levelIndex]
-      @attributes['alertLevels'][levelIndex][2]
-    end
-
     # Return the average number of working hours per day. This defaults to 8 but
     # can be set to other values by the user.
     def dailyWorkingHours
       @attributes['dailyworkinghours'].to_f
     end
 
-    # Return the average number of working days per week.
     def weeklyWorkingDays
-      @attributes['yearlyworkingdays'] / 52.1429
+      @attributes['workinghours'].weeklyWorkingHours /
+        @attributes['dailyworkinghours']
     end
 
     # Return the average number of working days per month.
@@ -625,7 +609,7 @@ class TaskJuggler
     def schedule
       initScoreboards
 
-      [ @shifts, @resources, @tasks ].each do |p|
+      [ @accounts, @shifts, @resources, @tasks ].each do |p|
         # Set all index counters to their proper values.
         p.index
       end
@@ -680,7 +664,9 @@ class TaskJuggler
 
       unless @accounts.empty?
         @reports.each do |report|
-          if report.get('costAccount').nil? || report.get('revenueAccount').nil?
+          if (report.typeSpec != :accountreport) &&
+             (report.get('costAccount').nil? ||
+              report.get('revenueAccount').nil?)
             warning('report_without_balance',
                     "The report #{report.fullId} has no 'balance' defined. " +
                     "No cost or revenue computation will be possible.",
@@ -738,6 +724,7 @@ class TaskJuggler
           Log.stopProgressMeter
         end
       end
+      DataCache.instance.flush
     end
 
     def generateReport(reportId, regExpMode, formats = nil,
@@ -828,6 +815,10 @@ class TaskJuggler
       @reports.addProperty(report)
     end
 
+    def removeAccount(account) # :nodoc:
+      @accounts.removeProperty(account)
+    end
+
     # call-seq:
     #   isWorkingTime(slotIdx) -> true or false
     #   isWorkingTime(slot) -> true or false
@@ -837,7 +828,7 @@ class TaskJuggler
     # Return true if the slot or interval is withing globally defined working
     # time or false if not. If the argument is a TimeInterval, all slots of
     # the interval must be working time to return true as result. Global work
-    # time means, no global vacation defined and the slot lies within a
+    # time means, no global leaves defined and the slot lies within a
     # defined global working time period.
     def isWorkingTime(*args)
       # Normalize argument(s) to TimeInterval
@@ -869,7 +860,7 @@ class TaskJuggler
     #   hasWorkingTime(interval) -> true or false
     #
     # Return true if the interval overlaps with a globally defined working
-    # time or false if not. Global work time means, no global vacation defined
+    # time or false if not. Global work time means, no global leaves defined
     # and the slot lies within a defined global working time period.
     def hasWorkingTime(*args)
       # Normalize argument(s) to TimeInterval
@@ -941,20 +932,20 @@ class TaskJuggler
       end
     end
 
-    # Return the number of working days (ignoring global vacations) during the
+    # Return the number of working days (ignoring global leaves) during the
     # given _interval_.
     def workingDays(interval)
       startIdx = dateToIdx(interval.start)
       endIdx = dateToIdx(interval.end)
       slots = 0
       startIdx.upto(endIdx) do |idx|
-        slots += 1 unless @scoreboardNoVacations[idx]
+        slots += 1 unless @scoreboardNoLeaves[idx]
       end
       slotsToDays(slots)
     end
 
     # Return the number of global working slots during the given time interval
-    # specified by _startIdx_ and _endIdx_. This method takes global vacations
+    # specified by _startIdx_ and _endIdx_. This method takes global leaves
     # into account.
     def getWorkSlots(startIdx, endIdx)
       slots = 0
@@ -1244,7 +1235,7 @@ class TaskJuggler
       @scoreboard = Scoreboard.new(@attributes['start'], @attributes['end'],
                                    @attributes['scheduleGranularity'], 2)
       # And the same for another scoreboard.
-      @scoreboardNoVacations =
+      @scoreboardNoLeaves =
         Scoreboard.new(@attributes['start'], @attributes['end'],
                        @attributes['scheduleGranularity'], 2)
 
@@ -1256,15 +1247,15 @@ class TaskJuggler
       scoreboardSize.times do |i|
         if workinghours.onShift?(date)
           @scoreboard[i] = nil
-          @scoreboardNoVacations[i] = nil
+          @scoreboardNoLeaves[i] = nil
         end
         date += delta
       end
 
-      # Mark all global vacation slots as such
-      @attributes['vacations'].each do |vacation|
-        startIdx = @scoreboard.dateToIdx(vacation.start)
-        endIdx = @scoreboard.dateToIdx(vacation.end)
+      # Mark all global leave slots as such
+      @attributes['leaves'].each do |leave|
+        startIdx = @scoreboard.dateToIdx(leave.interval.start)
+        endIdx = @scoreboard.dateToIdx(leave.interval.end)
         startIdx.upto(endIdx - 1) do |i|
           # If the slot is nil or set to 4 then don't set the time-off bit.
           sb = @scoreboard[i]