diff --git a/QBClasses.py b/QBClasses.py index 69b28fa..db83fb6 100644 --- a/QBClasses.py +++ b/QBClasses.py @@ -546,13 +546,15 @@ class CustomerQuery(baseQBQuery): if 'Operator' in kwargs and 'Amount' in kwargs: self.QBDict[self.classNameRq]["TotalBalanceFilter"]={'Operator':kwargs['Operator'], 'Amount':kwargs['Amount']} - if 'IncludeRetElement' in kwargs: + if 'IncludeRetElement' in kwargs and kwargs['IncludeRetElement']: IRE = cleanIncludeRetElements(self.includeRetElements_allowed, kwargs['IncludeRetElement']) print(f'{IRE = }') if len(IRE)>0: if self.defaultFilterKey not in IRE: IRE.append(self.defaultFilterKey) self.QBDict[self.classNameRq]["IncludeRetElement"]=IRE + else: + self.QBDict[self.classNameRq]["IncludeRetElement"]=self.includeRetElements_allowed if 'OwnerID' in kwargs: self.QBDict[self.classNameRq]["OwnerID"]=kwargs['OwnerID'] @@ -626,7 +628,8 @@ class TransactionQuery(baseQBQuery): self.QBDict[self.classNameRq]["TransactionDateRangeFilter"]={'FromTxnDate':kwargs.get('TransactionDateRangeFilter_FromTxnDate', ""), 'ToTxnDate':kwargs.get('TransactionDateRangeFilter_ToTxnDate', "")} elif 'TransactionDateRangeFilter_DateMacro' in kwargs: self.QBDict[self.classNameRq]["TransactionDateRangeFilter"]={'DateMacro':kwargs['TransactionDateRangeFilter_DateMacro']} - + + # if 'TransactionEntityFilter_EntityTypeFilter' in kwargs: self.QBDict[self.classNameRq]["TransactionEntityFilter"]={'EntityTypeFilter':kwargs['TransactionEntityFilter_EntityTypeFilter']} elif 'TransactionEntityFilter_ListID' in kwargs: @@ -637,7 +640,8 @@ class TransactionQuery(baseQBQuery): self.QBDict[self.classNameRq]["TransactionEntityFilter"]={'ListIDWithChildren':kwargs['TransactionEntityFilter_ListIDWithChildren']} elif 'TransactionEntityFilter_FullNameWithChildren' in kwargs: self.QBDict[self.classNameRq]["TransactionEntityFilter"]={'FullNameWithChildren':kwargs['TransactionEntityFilter_FullNameWithChildren']} - + + # if 'TransactionAccountFilter_AccountTypeFilter' in kwargs: self.QBDict[self.classNameRq]["TransactionAccountFilter"]={'AccountTypeFilter':kwargs['TransactionAccountFilter_AccountTypeFilter']} elif 'TransactionAccountFilter_ListID' in kwargs: @@ -649,6 +653,7 @@ class TransactionQuery(baseQBQuery): elif 'TransactionAccountFilter_FullNameWithChildren' in kwargs: self.QBDict[self.classNameRq]["TransactionAccountFilter"]={'FullNameWithChildren':kwargs['TransactionAccountFilter_FullNameWithChildren']} + # if 'TransactionItemFilter_ItemTypeFilter' in kwargs: self.QBDict[self.classNameRq]["TransactionItemFilter"]={'ItemTypeFilter':kwargs['TransactionItemFilter_ItemTypeFilter']} elif 'TransactionItemFilter_ListID' in kwargs: @@ -659,7 +664,7 @@ class TransactionQuery(baseQBQuery): self.QBDict[self.classNameRq]["TransactionItemFilter"]={'ListIDWithChildren':kwargs['TransactionItemFilter_ListIDWithChildren']} elif 'TransactionItemFilter_FullNameWithChildren' in kwargs: self.QBDict[self.classNameRq]["TransactionItemFilter"]={'FullNameWithChildren':kwargs['TransactionItemFilter_FullNameWithChildren']} - + if 'TransactionClassFilter_ListID' in kwargs: self.QBDict[self.classNameRq]["TransactionClassFilter"]={'ListID':kwargs['TransactionClassFilter_ListID']} elif 'TransactionClassFilter_FullName' in kwargs: @@ -668,16 +673,20 @@ class TransactionQuery(baseQBQuery): self.QBDict[self.classNameRq]["TransactionClassFilter"]={'ListIDWithChildren':kwargs['TransactionClassFilter_ListIDWithChildren']} elif 'TransactionClassFilter_FullNameWithChildren' in kwargs: self.QBDict[self.classNameRq]["TransactionClassFilter"]={'FullNameWithChildren':kwargs['TransactionClassFilter_FullNameWithChildren']} - + + # if 'TransactionTypeFilter_TxnTypeFilter' in kwargs: self.QBDict[self.classNameRq]["TransactionTypeFilter"]={'TxnTypeFilter':kwargs['TransactionTypeFilter_TxnTypeFilter']} - + + # if 'TransactionDetailLevelFilter' in kwargs: self.QBDict[self.classNameRq]["TransactionDetailLevelFilter"]=kwargs['TransactionDetailLevelFilter'] + # if 'TransactionPostingStatusFilter' in kwargs: self.QBDict[self.classNameRq]["TransactionPostingStatusFilter"]=kwargs['TransactionPostingStatusFilter'] - + + # if 'TransactionPaidStatusFilter' in kwargs: self.QBDict[self.classNameRq]["TransactionPaidStatusFilter"]=kwargs['TransactionPaidStatusFilter']