- Add an error message to prevent users from assigning account groups to

  tasks.

git-svn-id: https://www.taskjuggler.org/svn/taskjuggler/trunk@1300 e1914e07-63f8-0310-9059-d6d858d7cdca

diff --git a/TestSuite/Syntax/Correct/Reports.tjp b/TestSuite/Syntax/Correct/Reports.tjp
index d40340c..18dc455 100644 (file)
--- a/TestSuite/Syntax/Correct/Reports.tjp
+++ b/TestSuite/Syntax/Correct/Reports.tjp
@@ -34,7 +34,7 @@ task t2 "FooTask2" {
   start 2000-01-01
   duration 1d
   startcredit 10000.0
-  account a2
+  account a4
 }
 
 task t3 "FooTask3" {

diff --git a/docs/en/ChangeLog.xml b/docs/en/ChangeLog.xml
index aa66e5b..1bccb37 100644 (file)
--- a/docs/en/ChangeLog.xml
+++ b/docs/en/ChangeLog.xml
@@ -968,6 +968,9 @@ reports.</para></listitem>
 <listitem><para>XML reports now use the gzip compressed version 2 XML
 format by default.</para></listitem>
 
+<listitem><para>Add check to forbid assigning account groups to
+tasks.</para></listitem>
+
 </itemizedlist></para>
 
 </sect2>

diff --git a/docs/en/PropertyReference.xml b/docs/en/PropertyReference.xml
index 70de3dd..dfbc962 100644 (file)
--- a/docs/en/PropertyReference.xml
+++ b/docs/en/PropertyReference.xml
@@ -196,7 +196,8 @@ this type.</para></descr>
  </property>
  <property name="account" id="account_task" inheritable="Yes">
   <descr><para>All amounts associated with the task will be credited
-to the specified account.</para></descr>
+to the specified account. The account must not be an account group.
+</para></descr>
   <attributes>
    <attr name="accountid" type="ID"/>
   </attributes>

diff --git a/taskjuggler/Task.cpp b/taskjuggler/Task.cpp
index 73596aa..24b23f6 100644 (file)
--- a/taskjuggler/Task.cpp
+++ b/taskjuggler/Task.cpp
@@ -2024,6 +2024,15 @@ Task::hasEndDependency() const
 bool
 Task::preScheduleOk(int sc)
 {
+    if (account && !account->isLeaf())
+    {
+        errorMessage(i18n
+                     ("Task '%1' must not have an account group ('%2') "
+                      "assigned to it.")
+                     .arg(id).arg(account->getId()));
+        return false;
+    }
+
     if (hasSubs() && !scenarios[sc].bookedResources.isEmpty())
     {
         errorMessage(i18n