Merge pull request #364 from laf-rge/master

handle Decimal on amount values

Author: ej2

.github/workflows/python-package.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
 
     steps:
     - uses: actions/checkout@v3

quickbooks/mixins.py

@@ -7,10 +7,10 @@
 from .utils import build_choose_clause, build_where_clause
 
 class DecimalEncoder(json.JSONEncoder):
-    def default(self, obj):
-        if isinstance(obj, decimal.Decimal):
-            return str(obj)
-        return super(DecimalEncoder, self).default(obj)
+    def default(self, o):
+        if isinstance(o, decimal.Decimal):
+            return str(o)
+        return super(DecimalEncoder, self).default(o)
 
 class ToJsonMixin(object):
     def to_json(self):
@@ -21,7 +21,7 @@ def json_filter(self):
         filter out properties that have names starting with _
         or properties that have a value of None
         """
-        return lambda obj: dict((k, v) for k, v in obj.__dict__.items()
+        return lambda obj: str(obj) if isinstance(obj, decimal.Decimal) else dict((k, v) for k, v in obj.__dict__.items()
                                 if not k.startswith('_') and getattr(obj, k) is not None)
 
 

tests/unit/test_decimal.py

@@ -0,0 +1,21 @@
+from decimal import Decimal
+import unittest
+from quickbooks.objects.bill import Bill
+from quickbooks.objects.detailline import DetailLine
+
+
+class DecimalTestCase(unittest.TestCase):
+    def test_bill_with_decimal_amount(self):
+        """Test that a Bill with decimal line amounts can be converted to JSON without errors"""
+        bill = Bill()
+        line = DetailLine()
+        line.Amount = Decimal('42.42')
+        line.DetailType = "AccountBasedExpenseLineDetail"
+        
+        bill.Line.append(line)
+        
+        # This should not raise any exceptions
+        json_data = bill.to_json()
+        
+        # Verify the amount was converted correctly
+        self.assertIn('"Amount": "42.42"', json_data)