r14923 - gnucash/trunk - Correct account compatibility check with top level account.

Andreas Köhler andi5 at cvs.gnucash.org
Mon Oct 2 13:37:55 EDT 2006


Author: andi5
Date: 2006-10-02 13:37:55 -0400 (Mon, 02 Oct 2006)
New Revision: 14923
Trac: http://svn.gnucash.org/trac/changeset/14923

Modified:
   gnucash/trunk/
   gnucash/trunk/src/gnome-utils/dialog-account.c
Log:
Correct account compatibility check with top level account.



Property changes on: gnucash/trunk
___________________________________________________________________
Name: svk:merge
   - 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:660
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13379
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366
   + 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:671
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13379
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366

Modified: gnucash/trunk/src/gnome-utils/dialog-account.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-account.c	2006-10-02 14:58:57 UTC (rev 14922)
+++ gnucash/trunk/src/gnome-utils/dialog-account.c	2006-10-02 17:37:55 UTC (rev 14923)
@@ -759,7 +759,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);



More information about the gnucash-changes mailing list