diff --git a/models/doctype/Event/Event.js b/models/doctype/Event/Event.js
index 24adf04e..3f75f623 100644
--- a/models/doctype/Event/Event.js
+++ b/models/doctype/Event/Event.js
@@ -26,8 +26,8 @@ module.exports = {
         const today = DateTime.local();
         const eventDate = DateTime.fromISO(doc.date);
         const diff = eventDate.diff(today);
-
-        return Math.floor(diff.as('day'));
+        let daydiff = Math.floor(diff.as('day'));
+        return daydiff+1;
       }
     },
     {
diff --git a/models/doctype/Invoice/Invoice.js b/models/doctype/Invoice/Invoice.js
index a2252381..a740427d 100644
--- a/models/doctype/Invoice/Invoice.js
+++ b/models/doctype/Invoice/Invoice.js
@@ -38,7 +38,7 @@ module.exports = {
       label: 'Account',
       fieldtype: 'Link',
       target: 'Account',
-      formula : (doc) => doc.getFrom('Party', doc.customer , 'default_account'),
+      fetch: (doc) => doc.getFrom('Party', doc.customer , 'default_account'),
       getFilters: (query, control) => {
         return {
           keywords: ['like', query],