r15963 - gnucash/branches/2.0 - Fix missing exchange rate dialog on purchasing stocks. bug#335101.

[Derek Atkins]

Author: warlord
Date: 2007-04-21 15:19:09 -0400 (Sat, 21 Apr 2007)
New Revision: 15963
Trac: http://svn.gnucash.org/trac/changeset/15963

Modified:
   gnucash/branches/2.0/
   gnucash/branches/2.0/ChangeLog
   gnucash/branches/2.0/src/register/ledger-core/split-register-control.c
Log:
Fix missing exchange rate dialog on purchasing stocks. bug#335101.
Patch by Mike Alexander

Merge from r15879




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:14583
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:14584
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13282

Modified: gnucash/branches/2.0/ChangeLog
===================================================================
--- gnucash/branches/2.0/ChangeLog	2007-04-21 19:18:57 UTC (rev 15962)
+++ gnucash/branches/2.0/ChangeLog	2007-04-21 19:19:09 UTC (rev 15963)
@@ -1,5 +1,10 @@
 2007-04-21  Christian Stimming  <stimming at tuhh.de>
 
+	* Fix missing exchange rate dialog on purchasing stocks. bug#335101.
+	  Patch by Mike Alexander
+
+2007-04-21  Christian Stimming  <stimming at tuhh.de>
+
 	* Use aqbanking's FiId field for correct OFX duplicate matching.
 	  #418072, patch by David Reiser.
 

Modified: gnucash/branches/2.0/src/register/ledger-core/split-register-control.c
===================================================================
--- gnucash/branches/2.0/src/register/ledger-core/split-register-control.c	2007-04-21 19:18:57 UTC (rev 15962)
+++ gnucash/branches/2.0/src/register/ledger-core/split-register-control.c	2007-04-21 19:19:09 UTC (rev 15963)
@@ -1125,7 +1125,7 @@
    * _not_ the blank split, then return FALSE -- this is a "special"
    * gain/loss stock transaction.
    */
-  if (gnc_numeric_zero_p(exch_rate) && !force_dialog &&
+  if (gnc_numeric_zero_p(exch_rate) && !force_dialog && split &&
       split != gnc_split_register_get_blank_split (reg))
     return FALSE;