diff --git a/subscription/controls.py b/subscription/controls.py
index 338acf2..1dc5f8a 100644
--- a/subscription/controls.py
+++ b/subscription/controls.py
@@ -46,7 +46,7 @@ def createOrUpdateSubscription(partyId, partnerId, period):
             subscription.partnerId = partnerObj
             subscription.partyId = partyObj
             subscription.startDate = now
-            subscription.endDate = now+datetime.timedelta(days=period)
+            subscription.endDate = (now+datetime.timedelta(days=period)).replace(hour=23, minute=59, second=59, microsecond=999999)
 
             transactionType = 'create'
             transactionStartDate = subscription.startDate
@@ -55,13 +55,13 @@ def createOrUpdateSubscription(partyId, partnerId, period):
             endDate = subscription.endDate
             if (endDate<now):
                 # case2: expired subscription
-                subscription.endDate = now + datetime.timedelta(days=period)
+                subscription.endDate = (now + datetime.timedelta(days=period)).replace(hour=23, minute=59, second=59, microsecond=999999)
                 transactionType = 'renew'
                 transactionStartDate = now
                 transactionEndDate = subscription.endDate
             else:
                 # case3: active subscription
-                subscription.endDate = endDate + datetime.timedelta(days=period)
+                subscription.endDate = (endDate + datetime.timedelta(days=period)).replace(hour=23, minute=59, second=59, microsecond=999999)
                 transactionType = 'renew'
                 transactionStartDate = endDate
                 transactionEndDate = subscription.endDate