r15962 - gnucash/branches/2.0 - Use aqbanking's FiId field for correct OFX duplicate matching. #418072

[Derek Atkins]

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

Modified:
   gnucash/branches/2.0/
   gnucash/branches/2.0/ChangeLog
   gnucash/branches/2.0/src/import-export/hbci/gnc-hbci-gettrans.c
Log:
Use aqbanking's FiId field for correct OFX duplicate matching. #418072
patch by David Reiser.

Merge from r15868




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:14582
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:14583
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:44 UTC (rev 15961)
+++ gnucash/branches/2.0/ChangeLog	2007-04-21 19:18:57 UTC (rev 15962)
@@ -1,3 +1,8 @@
+2007-04-21  Christian Stimming  <stimming at tuhh.de>
+
+	* Use aqbanking's FiId field for correct OFX duplicate matching.
+	  #418072, patch by David Reiser.
+
 2007-04-21  David Hampton  <hampton at employees.org>
 
 	* Add some begin_edit/commit_edit checks.

Modified: gnucash/branches/2.0/src/import-export/hbci/gnc-hbci-gettrans.c
===================================================================
--- gnucash/branches/2.0/src/import-export/hbci/gnc-hbci-gettrans.c	2007-04-21 19:18:44 UTC (rev 15961)
+++ gnucash/branches/2.0/src/import-export/hbci/gnc-hbci-gettrans.c	2007-04-21 19:18:57 UTC (rev 15962)
@@ -39,6 +39,7 @@
 #include "dialog-hbcitrans.h"
 #include "gnc-hbci-kvp.h"
 #include "dialog-daterange.h"
+#include "import-utilities.h"
 
 /* static short module = MOD_IMPORT; */
 
@@ -261,11 +262,14 @@
   /* Create new gnucash transaction for the given hbci one */
   gnc_trans = xaccMallocTransaction(book);
   xaccTransBeginEdit(gnc_trans);
+    
+  {
+    /* OFX unique transaction ID */
+    const char *fitid = AB_Transaction_GetFiId(h_trans);
+    if (fitid && (strlen (fitid) > 0))
+      gnc_import_set_trans_online_id(gnc_trans, fitid);
+  }
 
-  /*if(data.fi_id_valid==true){
-    gnc_import_set_trans_online_id(gnc_trans, data.fi_id);
-    }*/
-
   normalDate = AB_Transaction_GetDate(h_trans);
   valutaDate = AB_Transaction_GetValutaDate(h_trans);
   if (normalDate && !valutaDate)