Updated to_json mixin to filter out properties that have a value of None. Fixed issues on JournalEntry.

ej2 · ej2 · commit bcb8e133a171 · 2015-09-15T16:26:19.000-05:00
diff --git a/quickbooks/client.py b/quickbooks/client.py
@@ -153,6 +153,7 @@ def make_request(self, request_type, url, request_body=None, content_type='appli
             'Content-Type': content_type,
             'Accept': 'application/json'
         }
+
         req = self.session.request(request_type, url, True, self.company_id, headers=headers, data=request_body)
 
         try:
diff --git a/quickbooks/mixins.py b/quickbooks/mixins.py
@@ -4,8 +4,13 @@
 
 class ToJsonMixin(object):
     def to_json(self):
-        return json.dumps(self, default=lambda obj: {k: v for k, v in obj.__dict__.items() if not k.startswith('_')},
-                          sort_keys=True, indent=4)
+        return json.dumps(self, default=self.json_filter(), sort_keys=True, indent=4)
+
+    def json_filter(self):
+        # filter out properties that have names starting with _ or properties that have a value of None
+        return lambda obj: {k: v for k, v in obj.__dict__.items()
+                                   if not k.startswith('_') and getattr(obj, k) is not None}
+
 
 class FromJsonMixin(object):
     class_dict = {}
diff --git a/quickbooks/objects/base.py b/quickbooks/objects/base.py
@@ -13,7 +13,7 @@ class QuickbooksTransactionEntity(QuickbooksBaseObject):
     def __init__(self):
         self.Id = None
         self.SyncToken = 0
-        self.sparse = "false"
+        self.sparse = False
         self.domain = "QBO"
         self.TxnDate = ""
 
@@ -43,7 +43,7 @@ def to_linked_txn(self):
 
 class Address(ToJsonMixin, FromJsonMixin):
     def __init__(self):
-        self.Id = 0
+        self.Id = None
         self.Line1 = ""
         self.Line2 = ""
         self.City = ""
diff --git a/quickbooks/objects/detailline.py b/quickbooks/objects/detailline.py
@@ -9,7 +9,7 @@ class DetailLine(QuickbooksBaseObject):
 
     def __init__(self):
         super(DetailLine, self).__init__()
-        self.Id = 0
+        self.Id = None
         self.LineNum = 0
         self.Description = ""
         self.Amount = 0
diff --git a/quickbooks/objects/journalentry.py b/quickbooks/objects/journalentry.py
@@ -4,21 +4,34 @@
 from detailline import DetailLine
 
 
+class Entity(QuickbooksBaseObject):
+    class_dict = {
+        "EntityRef": Ref
+    }
+
+    def __init__(self):
+        super(Entity, self).__init__()
+        self.Type = ""
+        self.EntityRef = None
+
+
 class JournalEntryLineDetail(QuickbooksBaseObject):
     class_dict = {
-        "Entity": Ref
+        "Entity": Entity,
+        "AccountRef": Ref,
+        "ClassRef": Ref,
+        "DepartmentRef": Ref,
+        "TaxCodeRef": Ref,
     }
 
     def __init__(self):
         super(JournalEntryLineDetail, self).__init__()
         self.PostingType = ""
-        self.TaxApplicableOn = ""
-        self.Type = ""
+        self.TaxApplicableOn = "Sales"
         self.TaxAmount = 0
         self.BillableStatus = ""
 
         self.Entity = None
-        self.EntityRef = None
         self.AccountRef = None
         self.ClassRef = None
         self.DepartmentRef = None
@@ -82,7 +95,7 @@ def __init__(self):
         super(JournalEntry, self).__init__()
         self.Adjustment = False
         self.TxnDate = ""
-        self.TxnSource = ""
+        #self.TxnSource = ""
         self.DocNumber = ""
         self.PrivateNote = ""
         self.TotalAmt = 0
diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 
-VERSION = (0, 2, 4)
+VERSION = (0, 2, 5)
 version = '.'.join(map(str, VERSION))
 
 setup(
diff --git a/tests/unit/objects/test_journalentry.py b/tests/unit/objects/test_journalentry.py
@@ -24,12 +24,10 @@ def test_init(self):
         journalentry = JournalEntryLineDetail()
 
         self.assertEquals(journalentry.PostingType, "")
-        self.assertEquals(journalentry.TaxApplicableOn, "")
-        self.assertEquals(journalentry.Type, "")
+        self.assertEquals(journalentry.TaxApplicableOn, "Sales")
         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)

Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,7 @@ def make_request(self, request_type, url, request_body=None, content_type='appli`
`153`	`153`	`'Content-Type': content_type,`
`154`	`154`	`'Accept': 'application/json'`
`155`	`155`	`}`
	`156`	`+`
`156`	`157`	`req = self.session.request(request_type, url, True, self.company_id, headers=headers, data=request_body)`
`157`	`158`
`158`	`159`	`try:`