r15052 - gnucash/trunk - Correct order of account and split parameters to xaccSplitSetAccount in

Andreas Köhler andi5 at cvs.gnucash.org
Sat Oct 21 09:26:47 EDT 2006


Author: andi5
Date: 2006-10-21 09:26:46 -0400 (Sat, 21 Oct 2006)
New Revision: 15052
Trac: http://svn.gnucash.org/trac/changeset/15052

Modified:
   gnucash/trunk/
   gnucash/trunk/src/engine/engine-interface.scm
   gnucash/trunk/src/import-export/qif-import/qif-to-gnc.scm
   gnucash/trunk/src/import-export/qif-io-core/qif-bank-xtn-import.scm
   gnucash/trunk/src/import-export/qif-io-core/qif-invst-xtn-import.scm
Log:
Correct order of account and split parameters to xaccSplitSetAccount in
a few scheme files.



Property changes on: gnucash/trunk
___________________________________________________________________
Name: svk:merge
   - 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:802
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:848
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13528
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366
   + 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:802
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:849
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13528
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366

Modified: gnucash/trunk/src/engine/engine-interface.scm
===================================================================
--- gnucash/trunk/src/engine/engine-interface.scm	2006-10-21 13:26:31 UTC (rev 15051)
+++ gnucash/trunk/src/engine/engine-interface.scm	2006-10-21 13:26:46 UTC (rev 15052)
@@ -128,7 +128,7 @@
           (if account
               (begin
                 (xaccAccountBeginEdit account)
-                (xaccSplitSetAccount account split)
+                (xaccSplitSetAccount split account)
                 (xaccAccountCommitEdit account)))))))
 
 ;; Defines a scheme representation of a transaction.

Modified: gnucash/trunk/src/import-export/qif-import/qif-to-gnc.scm
===================================================================
--- gnucash/trunk/src/import-export/qif-import/qif-to-gnc.scm	2006-10-21 13:26:31 UTC (rev 15051)
+++ gnucash/trunk/src/import-export/qif-import/qif-to-gnc.scm	2006-10-21 13:26:46 UTC (rev 15052)
@@ -480,7 +480,7 @@
                          (xaccSplitSetReconcile gnc-far-split #\y)))
                    
                    ;; finally, plug the split into the account 
-                   (xaccSplitSetAccount far-acct gnc-far-split)
+                   (xaccSplitSetAccount gnc-far-split far-acct)
                    (xaccTransAppendSplit gnc-xtn gnc-far-split))))
            splits)
           
@@ -488,7 +488,7 @@
           (xaccSplitSetValue gnc-near-split near-split-total)
           (xaccSplitSetAmount gnc-near-split near-split-total)
           (xaccTransAppendSplit gnc-xtn gnc-near-split)
-          (xaccSplitSetAccount near-acct gnc-near-split))
+          (xaccSplitSetAccount gnc-near-split near-acct))
         
         ;; STOCK TRANSACTIONS: the near/far accounts depend on the
         ;; "action" encoded in the Number field.  It's generally the
@@ -632,16 +632,16 @@
           (if (and qif-near-acct qif-far-acct)
               (begin 
                 (xaccTransAppendSplit gnc-xtn gnc-near-split)
-                (xaccSplitSetAccount near-acct gnc-near-split)
+                (xaccSplitSetAccount gnc-near-split near-acct)
                 
                 (xaccTransAppendSplit gnc-xtn gnc-far-split)
-                (xaccSplitSetAccount far-acct gnc-far-split)
+                (xaccSplitSetAccount gnc-far-split far-acct)
                 
                 (if commission-split
                     (begin 
                       (xaccTransAppendSplit gnc-xtn commission-split)
-                      (xaccSplitSetAccount commission-acct
-                                                commission-split)))))))
+                      (xaccSplitSetAccount commission-split
+                                           commission-acct)))))))
     ;; return the modified transaction (though it's ignored).
     gnc-xtn))
 

Modified: gnucash/trunk/src/import-export/qif-io-core/qif-bank-xtn-import.scm
===================================================================
--- gnucash/trunk/src/import-export/qif-io-core/qif-bank-xtn-import.scm	2006-10-21 13:26:31 UTC (rev 15051)
+++ gnucash/trunk/src/import-export/qif-io-core/qif-bank-xtn-import.scm	2006-10-21 13:26:46 UTC (rev 15052)
@@ -72,7 +72,7 @@
         
         ;; add it to the account and the transaction
         (xaccAccountBeginEdit acct)
-        (xaccSplitSetAccount acct split)
+        (xaccSplitSetAccount split acct)
         (xaccAccountCommitEdit acct)
         (xaccTransAppendSplit gnc-xtn split)
         split))

Modified: gnucash/trunk/src/import-export/qif-io-core/qif-invst-xtn-import.scm
===================================================================
--- gnucash/trunk/src/import-export/qif-io-core/qif-invst-xtn-import.scm	2006-10-21 13:26:31 UTC (rev 15051)
+++ gnucash/trunk/src/import-export/qif-io-core/qif-invst-xtn-import.scm	2006-10-21 13:26:46 UTC (rev 15052)
@@ -170,7 +170,7 @@
         
         ;; add it to the account and the transaction
         (xaccAccountBeginEdit acct)
-        (xaccSplitSetAccount acct split)
+        (xaccSplitSetAccount split acct)
         (xaccAccountCommitEdit acct)
         (xaccTransAppendSplit gnc-xtn split)
         split))



More information about the gnucash-changes mailing list