r15253 - gnucash/branches/2.0 - Correct account compatibility check with top level account. #389317

[Derek Atkins]

Author: warlord
Date: 2006-12-25 09:16:43 -0500 (Mon, 25 Dec 2006)
New Revision: 15253
Trac: http://svn.gnucash.org/trac/changeset/15253

Modified:
   gnucash/branches/2.0/
   gnucash/branches/2.0/ChangeLog
   gnucash/branches/2.0/src/gnome-utils/dialog-account.c
Log:
Correct account compatibility check with top level account. #389317

Merge from r14923.



Property changes on: gnucash/branches/2.0
___________________________________________________________________
Name: svk:merge
   - 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/2.0:697
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/2.0:13675
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13282
   + 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/2.0:697
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/2.0:13761
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13282

Modified: gnucash/branches/2.0/ChangeLog
===================================================================
--- gnucash/branches/2.0/ChangeLog	2006-12-23 21:10:47 UTC (rev 15252)
+++ gnucash/branches/2.0/ChangeLog	2006-12-25 14:16:43 UTC (rev 15253)
@@ -1,3 +1,7 @@
+2006-12-25  Andreas Köhler  <andi5.py at gmx.net>
+
+	* Correct account compatibility check with top level account. #389317
+
 2006-12-20  Benoit Grégoire <bock at step.polymtl.ca>
 
 	* src/import-export/test/Makefile.am:  Minor fix so build 

Modified: gnucash/branches/2.0/src/gnome-utils/dialog-account.c
===================================================================
--- gnucash/branches/2.0/src/gnome-utils/dialog-account.c	2006-12-23 21:10:47 UTC (rev 15252)
+++ gnucash/branches/2.0/src/gnome-utils/dialog-account.c	2006-12-25 14:16:43 UTC (rev 15253)
@@ -751,7 +751,8 @@
   }
 
   /* check whether the types of child and parent are compatible */
-  if (!xaccAccountTypesCompatible (aw->type, xaccAccountGetType (parent))) {
+  if (parent != aw->top_level_account &&
+      !xaccAccountTypesCompatible (aw->type, xaccAccountGetType (parent))) {
     const char *message = _("The selected account type is incompatible with "
                             "the one of the selected parent.");
     gnc_error_dialog(aw->dialog, message);