gnucash maint: - Add Account.AssignLots to python bindings

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/caf17ea0 (commit)
	from  https://github.com/Gnucash/gnucash/commit/cbbf629e (commit)



commit caf17ea01f7aae1c361f3330a95de24185dc4c47
Author: Emily Zora <milliehandshrimp at users.noreply.github.com>
Date:   Sat Dec 26 20:00:57 2015 +0530

    - Add Account.AssignLots to python bindings
    
    Added functions from cap-gains.h and Scrub3.h to the python bindings.

diff --git a/src/optional/python-bindings/gnucash_core.i b/src/optional/python-bindings/gnucash_core.i
index 13aef43..24ac68b 100644
--- a/src/optional/python-bindings/gnucash_core.i
+++ b/src/optional/python-bindings/gnucash_core.i
@@ -80,6 +80,8 @@
 #include "gncIDSearch.h"
 #include "engine/gnc-pricedb.h"
 #include "app-utils/gnc-prefs-utils.h"
+#include "cap-gains.h"
+#include "Scrub3.h"
 %}
 
 %include <timespec.i>
@@ -209,6 +211,9 @@
 // Commodity prices includes and stuff
 %include <gnc-pricedb.h>
 
+%include <cap-gains.h>
+%include <Scrub3.h>
+
 %init %{
 gnc_environment_setup();
 qof_log_init();
diff --git a/src/optional/python-bindings/tests/test_account.py b/src/optional/python-bindings/tests/test_account.py
index 8908bad..b05f171 100644
--- a/src/optional/python-bindings/tests/test_account.py
+++ b/src/optional/python-bindings/tests/test_account.py
@@ -1,6 +1,7 @@
 from unittest import main
-
-from gnucash import Book, Account, Split
+from datetime import datetime
+from gnucash import Book, Account, Split, GncCommodity, GncNumeric, \
+    Transaction
 
 from test_book import BookSession
 
@@ -21,5 +22,49 @@ class TestAccount( AccountSession ):
         self.assertTrue(self.account.insert_split(SPLIT))
         self.assertTrue(self.account.remove_split(SPLIT))
 
+    def test_assignlots(self):
+        abc = GncCommodity(self.book, 'ABC Fund',
+            'COMMODITY','ABC','ABC',100000)
+        self.table.insert(abc)
+        self.account.SetCommodity(abc)
+
+        other = Account(self.book)
+        other.SetCommodity(self.currency)
+
+        tx = Transaction(self.book)
+        tx.BeginEdit()
+        tx.SetCurrency(self.currency)
+        tx.SetDateEnteredTS(datetime.now())
+        tx.SetDatePostedTS(datetime.now())
+
+        s1a = Split(self.book)
+        s1a.SetParent(tx)
+        s1a.SetAccount(self.account)
+        s1a.SetAmount(GncNumeric(1.0))
+        s1a.SetValue(GncNumeric(100.0))
+
+        s1b = Split(self.book)
+        s1b.SetParent(tx)
+        s1b.SetAccount(other)
+        s1b.SetAmount(GncNumeric(-100.0))
+        s1b.SetValue(GncNumeric(-100.0))
+
+        s2a = Split(self.book)
+        s2a.SetParent(tx)
+        s2a.SetAccount(self.account)
+        s2a.SetAmount(GncNumeric(-0.5))
+        s2a.SetValue(GncNumeric(-100.0))
+
+        s2b = Split(self.book)
+        s2b.SetParent(tx)
+        s2b.SetAccount(other)
+        s2b.SetAmount(GncNumeric(100.0))
+        s2b.SetValue(GncNumeric(100.0))
+
+        tx.CommitEdit()
+
+        self.account.ScrubLots()
+        self.assertEqual(len(self.account.GetLotList()),1)
+
 if __name__ == '__main__':
     main()
diff --git a/src/optional/python-bindings/tests/test_book.py b/src/optional/python-bindings/tests/test_book.py
index ebc25fe..80239cc 100644
--- a/src/optional/python-bindings/tests/test_book.py
+++ b/src/optional/python-bindings/tests/test_book.py
@@ -6,8 +6,8 @@ class BookSession( TestCase ):
     def setUp(self):
         self.ses = Session()
         self.book = self.ses.get_book()
-        table = self.book.get_table()
-        self.currency = table.lookup('CURRENCY', 'EUR')
+        self.table = self.book.get_table()
+        self.currency = self.table.lookup('CURRENCY', 'EUR')
 
 class TestBook( BookSession ):
     def test_markclosed(self):



Summary of changes:
 src/optional/python-bindings/gnucash_core.i        |  5 +++
 src/optional/python-bindings/tests/test_account.py | 49 +++++++++++++++++++++-
 src/optional/python-bindings/tests/test_book.py    |  4 +-
 3 files changed, 54 insertions(+), 4 deletions(-)