Updated JournalEntry.

ej2 · ej2 · commit 2ee719bb8e2c · 2015-09-10T14:05:59.000-05:00
diff --git a/quickbooks/objects/journalentry.py b/quickbooks/objects/journalentry.py
@@ -1,50 +1,59 @@
-from base import QuickbooksBaseObject, Ref, QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin
+from base import QuickbooksBaseObject, Ref, QuickbooksManagedObject, QuickbooksTransactionEntity, \
+    LinkedTxnMixin
 from tax import TxnTaxDetail
-
-
-class Entity(QuickbooksBaseObject):
-    class_dict = {
-        "EntityRef": Ref
-    }
-
-    def __init__(self):
-        super(Entity, self).__init__()
-        self.Type = ""
-        self.EntityRef = None
+from detailline import DetailLine
 
 
 class JournalEntryLineDetail(QuickbooksBaseObject):
     class_dict = {
-        "AccountRef": Ref,
         "Entity": Ref
     }
 
     def __init__(self):
         super(JournalEntryLineDetail, self).__init__()
         self.PostingType = ""
+        self.TaxApplicableOn = ""
+        self.Type = ""
+        self.TaxAmount = 0
+        self.BillableStatus = ""
+
         self.Entity = None
+        self.EntityRef = None
         self.AccountRef = None
-
-    def __unicode__(self):
-        return self.PostingType
+        self.ClassRef = None
+        self.DepartmentRef = None
+        self.TaxCodeRef = None
 
 
-class JournalEntryLine(QuickbooksBaseObject):
+class JournalEntryLine(DetailLine):
     class_dict = {
         "JournalEntryLineDetail": JournalEntryLineDetail
     }
 
     def __init__(self):
         super(JournalEntryLine, self).__init__()
-        self.Description = ""
-        self.Amount = 0
-        self.Id = 0
-        self.LineNum = 0
         self.DetailType = "JournalEntryLineDetail"
         self.JournalEntryLineDetail = None
 
-    def __unicode__(self):
-        return str(self.Amount)
+
+class DescriptionLineDetail(QuickbooksBaseObject):
+    class_dict = {
+        "TaxCodeRef": Ref
+    }
+
+    def __init__(self):
+        super(DescriptionLineDetail, self).__init__()
+        self.ServiceDate = ""
+
+
+class DescriptionOnlyLine(DetailLine):
+    class_dict = {
+        "DescriptionLineDetail": DescriptionLineDetail
+    }
+
+    def __init__(self):
+        super(DescriptionOnlyLine, self).__init__()
+        self.DetailType = "DescriptionOnly"
 
 
 class JournalEntry(QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedTxnMixin):
@@ -59,7 +68,8 @@ class JournalEntry(QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedT
     """
 
     class_dict = {
-        "TxnTaxDetail": TxnTaxDetail
+        "TxnTaxDetail": TxnTaxDetail,
+        "CurrencyRef": Ref,
     }
 
     list_dict = {
@@ -72,10 +82,15 @@ def __init__(self):
         super(JournalEntry, self).__init__()
         self.Adjustment = False
         self.TxnDate = ""
+        self.TxnSource = ""
         self.DocNumber = ""
+        self.PrivateNote = ""
         self.TotalAmt = 0
+        self.ExchangeRate = 1
         self.Line = []
         self.TxnTaxDetail = None
 
+        self.CurrencyRef = None
+
     def __unicode__(self):
         return str(self.TotalAmt)
diff --git a/tests/unit/objects/test_journalentry.py b/tests/unit/objects/test_journalentry.py
@@ -12,16 +12,25 @@ def test_unicode(self):
 
 
 class JournalEntryLineTests(unittest.TestCase):
-    def test_unicode(self):
+    def test_init(self):
         journalentry = JournalEntryLine()
-        journalentry.Amount = 100
 
-        self.assertEquals(unicode(journalentry), "100")
+        self.assertEquals(journalentry.DetailType, "JournalEntryLineDetail")
+        self.assertEquals(journalentry.JournalEntryLineDetail, None)
 
 
 class JournalEntryLineDetailTests(unittest.TestCase):
-    def test_unicode(self):
+    def test_init(self):
         journalentry = JournalEntryLineDetail()
-        journalentry.PostingType = "test"
 
-        self.assertEquals(unicode(journalentry), "test")
+        self.assertEquals(journalentry.PostingType, "")
+        self.assertEquals(journalentry.TaxApplicableOn, "")
+        self.assertEquals(journalentry.Type, "")
+        self.assertEquals(journalentry.TaxAmount, 0)
+        self.assertEquals(journalentry.BillableStatus, "")
+        self.assertEquals(journalentry.Entity, None)
+        self.assertEquals(journalentry.EntityRef, None)
+        self.assertEquals(journalentry.AccountRef, None)
+        self.assertEquals(journalentry.ClassRef, None)
+        self.assertEquals(journalentry.DepartmentRef, None)
+        self.assertEquals(journalentry.TaxCodeRef, None)
