From 86d0ef3d063ab69c610128e767fe4786385a759b Mon Sep 17 00:00:00 2001
From: thefalconx33 <thefalconx33@gmail.com>
Date: Thu, 1 Aug 2019 17:22:58 +0530
Subject: [PATCH] - Dashboard - SearchBar - Invoice & Bill Rename

---
 fixtures/invoicePrint.js                      |   2 +-
 models/doctype/Account/importCOA.js           | 101 +++----
 models/doctype/Bill/BillDocument.js           |   4 -
 models/doctype/BillSettings/BillSettings.js   |  18 --
 .../doctype/DashboardChart/DashboardChart.js  |  24 ++
 .../DashboardSettings/DashboardSettings.js    |  19 ++
 models/doctype/GSTR3B/GSTR3BDocument.js       |  17 +-
 .../InvoiceSettings/InvoiceSettings.js        |  42 ---
 models/doctype/Party/Party.js                 |  11 +-
 models/doctype/Payment/PaymentServer.js       |   2 +-
 .../PurchaseInvoice.js}                       |   9 +-
 .../PurchaseInvoiceDocument.js                |   4 +
 .../PurchaseInvoiceList.js}                   |   4 +-
 .../PurchaseInvoiceServer.js}                 |   6 +-
 .../PurchaseInvoiceItem.js}                   |   3 +-
 .../PurchaseInvoiceSettings.js                |  18 ++
 models/doctype/PurchaseOrder/PurchaseOrder.js |  26 +-
 .../PurchaseOrderItem/PurchaseOrderItem.js    |   4 +-
 .../PurchaseOrderSettings.js                  |   4 +-
 .../SalesInvoice.js}                          |   9 +-
 .../SalesInvoiceDocument.js}                  |   2 +-
 .../SalesInvoiceList.js}                      |   4 +-
 .../SalesInvoicePrint.vue}                    |   6 +-
 .../SalesInvoiceServer.js}                    |   6 +-
 .../Templates/AddressDetails.js               |   0
 .../Templates/CompanyAddress.vue              |   0
 .../Templates/CustomerAddress.vue             |   0
 .../Templates/InvoiceStyles.js                |   0
 .../Templates/InvoiceTemplate1.vue            |   0
 .../Templates/InvoiceTemplate2.vue            |   0
 .../Templates/InvoiceTemplate3.vue            |   0
 .../SalesInvoiceItem.js}                      |   2 +-
 .../SalesInvoiceSettings.js                   |  42 +++
 models/index.js                               |  14 +-
 package.json                                  |   1 +
 .../AccountsReceivablePayable.js              | 264 ++++++++++--------
 reports/GeneralLedger/GeneralLedgerView.js    |   2 +-
 reports/GeneralLedger/viewConfig.js           |   2 +-
 reports/GoodsAndServiceTax/BaseGSTR.js        |   4 +-
 reports/PurchaseRegister/PurchaseRegister.js  |  83 +++---
 .../PurchaseRegister/PurchaseRegisterView.js  |  36 +--
 reports/PurchaseRegister/viewConfig.js        |  42 +++
 reports/SalesRegister/SalesRegisterView.js    |   2 +-
 reports/SalesRegister/viewConfig.js           |  31 +-
 reports/view.js                               |   1 +
 server/postStart.js                           |   8 +-
 src/components/DashboardCard.vue              |  26 ++
 src/components/InvoiceCustomizer.vue          |   6 +-
 src/components/PageHeader.vue                 |  12 +-
 src/components/SearchBar.vue                  | 152 ++++++++++
 src/components/SearchInput.vue                |  39 ---
 src/components/Sidebar.vue                    |   5 +-
 src/pages/Dashboard.vue                       | 119 ++++++++
 src/pages/DataImport/index.vue                |   2 +-
 src/pages/Desk.vue                            |  15 +-
 src/pages/FormView/FormView.vue               |   8 +-
 src/pages/ListView/ListRow.vue                |   4 +-
 src/pages/ListView/ListToolbar.vue            |  12 +-
 src/pages/ListView/index.vue                  |   8 +-
 src/pages/ListView/listConfig.js              |   8 +-
 src/pages/PrintView/index.vue                 |   6 +-
 src/pages/Report/index.vue                    |   6 +-
 src/pages/ReportList.vue                      |  14 +-
 src/pages/Settings/Settings.vue               |  22 +-
 src/router/index.js                           |   3 +-
 src/sidebarConfig.js                          |  50 ++--
 66 files changed, 922 insertions(+), 474 deletions(-)
 delete mode 100644 models/doctype/Bill/BillDocument.js
 delete mode 100644 models/doctype/BillSettings/BillSettings.js
 create mode 100644 models/doctype/DashboardChart/DashboardChart.js
 create mode 100644 models/doctype/DashboardSettings/DashboardSettings.js
 delete mode 100644 models/doctype/InvoiceSettings/InvoiceSettings.js
 rename models/doctype/{Bill/Bill.js => PurchaseInvoice/PurchaseInvoice.js} (94%)
 create mode 100644 models/doctype/PurchaseInvoice/PurchaseInvoiceDocument.js
 rename models/doctype/{Bill/BillList.js => PurchaseInvoice/PurchaseInvoiceList.js} (90%)
 rename models/doctype/{Bill/BillServer.js => PurchaseInvoice/PurchaseInvoiceServer.js} (90%)
 rename models/doctype/{BillItem/BillItem.js => PurchaseInvoiceItem/PurchaseInvoiceItem.js} (95%)
 create mode 100644 models/doctype/PurchaseInvoiceSettings/PurchaseInvoiceSettings.js
 rename models/doctype/{Invoice/Invoice.js => SalesInvoice/SalesInvoice.js} (95%)
 rename models/doctype/{Invoice/InvoiceDocument.js => SalesInvoice/SalesInvoiceDocument.js} (97%)
 rename models/doctype/{Invoice/InvoiceList.js => SalesInvoice/SalesInvoiceList.js} (91%)
 rename models/doctype/{Invoice/InvoicePrint.vue => SalesInvoice/SalesInvoicePrint.vue} (90%)
 rename models/doctype/{Invoice/InvoiceServer.js => SalesInvoice/SalesInvoiceServer.js} (91%)
 rename models/doctype/{Invoice => SalesInvoice}/Templates/AddressDetails.js (100%)
 rename models/doctype/{Invoice => SalesInvoice}/Templates/CompanyAddress.vue (100%)
 rename models/doctype/{Invoice => SalesInvoice}/Templates/CustomerAddress.vue (100%)
 rename models/doctype/{Invoice => SalesInvoice}/Templates/InvoiceStyles.js (100%)
 rename models/doctype/{Invoice => SalesInvoice}/Templates/InvoiceTemplate1.vue (100%)
 rename models/doctype/{Invoice => SalesInvoice}/Templates/InvoiceTemplate2.vue (100%)
 rename models/doctype/{Invoice => SalesInvoice}/Templates/InvoiceTemplate3.vue (100%)
 rename models/doctype/{InvoiceItem/InvoiceItem.js => SalesInvoiceItem/SalesInvoiceItem.js} (98%)
 create mode 100644 models/doctype/SalesInvoiceSettings/SalesInvoiceSettings.js
 create mode 100644 reports/PurchaseRegister/viewConfig.js
 create mode 100644 src/components/DashboardCard.vue
 create mode 100644 src/components/SearchBar.vue
 delete mode 100644 src/components/SearchInput.vue
 create mode 100644 src/pages/Dashboard.vue

diff --git a/fixtures/invoicePrint.js b/fixtures/invoicePrint.js
index 790dc5e6..ca11e852 100644
--- a/fixtures/invoicePrint.js
+++ b/fixtures/invoicePrint.js
@@ -1,7 +1,7 @@
 module.exports = {
   doctype: "PrintFormat",
   name: "Standard Invoice Format",
-  for: "Invoice",
+  for: "SalesInvoice",
   template: `
     <h1>{{ doc.name }}</h1>
     <div class="row py-4">
diff --git a/models/doctype/Account/importCOA.js b/models/doctype/Account/importCOA.js
index 50a1b4c2..2b4284ed 100644
--- a/models/doctype/Account/importCOA.js
+++ b/models/doctype/Account/importCOA.js
@@ -3,67 +3,72 @@ const path = require('path');
 const fs = require('fs');
 const countries = require('../../../fixtures/countryInfo.json');
 const standardCOA = require('../../../fixtures/verified/standardCOA.json');
-const accountFields = ['accountType', 'rootType', 'isGroup', 'account_type', 'root_type', 'is_group'];
+const accountFields = [
+  'accountType',
+  'rootType',
+  'isGroup',
+  'account_type',
+  'root_type',
+  'is_group'
+];
 
 async function importAccounts(children, parent, rootType, rootAccount) {
-    for (let accountName in children) {
-        const child = children[accountName];
+  for (let accountName in children) {
+    const child = children[accountName];
 
-        if (rootAccount) {
-            rootType = child.rootType || child.root_type;
-        }
-
-        if (!accountFields.includes(accountName)) {
-            let isGroup = identifyIsGroup(child);
-            const doc = frappe.newDoc({
-                doctype: 'Account',
-                name: accountName,
-                parentAccount: parent,
-                isGroup,
-                rootType,
-                balance: 0,
-                accountType: child.accountType
-            })
-
-            await doc.insert()
-
-            await importAccounts(child, accountName, rootType)
-        }
+    if (rootAccount) {
+      rootType = child.rootType || child.root_type;
     }
+
+    if (!accountFields.includes(accountName)) {
+      let isGroup = identifyIsGroup(child);
+      const doc = frappe.newDoc({
+        doctype: 'Account',
+        name: accountName,
+        parentAccount: parent,
+        isGroup,
+        rootType,
+        balance: 0,
+        accountType: child.accountType || child.account_type
+      });
+
+      await doc.insert();
+
+      await importAccounts(child, accountName, rootType);
+    }
+  }
 }
 
 function identifyIsGroup(child) {
-    if (child.isGroup || child.is_group) {
-        return child.isGroup || child.is_group;
-    }
+  if (child.isGroup || child.is_group) {
+    return child.isGroup || child.is_group;
+  }
 
-    const keys = Object.keys(child);
-    const children = keys.filter(key => !accountFields.includes(key))
+  const keys = Object.keys(child);
+  const children = keys.filter(key => !accountFields.includes(key));
 
-    if (children.length) {
-        return 1;
-    }
+  if (children.length) {
+    return 1;
+  }
 
-    return 0;
+  return 0;
 }
 
-async function getCountryCOA(){
-    const doc = await frappe.getDoc('AccountingSettings');
-    const conCode = countries[doc.country].code;
+async function getCountryCOA() {
+  const doc = await frappe.getDoc('AccountingSettings');
+  const conCode = countries[doc.country].code;
 
-    const countryCOA = path.resolve(path.join('./fixtures/verified/', conCode + '.json'));
-
-    if(fs.existsSync(countryCOA)){
-        const jsonText = fs.readFileSync(countryCOA, 'utf-8');
-        const json = JSON.parse(jsonText);
-        return json.tree;
-    } else {
-        return standardCOA;
-    }
+  try {
+    const countryCoa = require('../../../fixtures/verified/' +
+      conCode +
+      '.json');
+    return countryCoa.tree;
+  } catch (e) {
+    return standardCOA;
+  }
 }
 
 module.exports = async function importCharts() {
-    const chart = await getCountryCOA();
-    await importAccounts(chart, '', '', true)
-}
-
+  const chart = await getCountryCOA();
+  await importAccounts(chart, '', '', true);
+};
diff --git a/models/doctype/Bill/BillDocument.js b/models/doctype/Bill/BillDocument.js
deleted file mode 100644
index 12561406..00000000
--- a/models/doctype/Bill/BillDocument.js
+++ /dev/null
@@ -1,4 +0,0 @@
-const InvoiceDocument = require('../Invoice/InvoiceDocument');
-const frappe = require('frappejs');
-
-module.exports = class Bill extends InvoiceDocument { }
diff --git a/models/doctype/BillSettings/BillSettings.js b/models/doctype/BillSettings/BillSettings.js
deleted file mode 100644
index b8126fb4..00000000
--- a/models/doctype/BillSettings/BillSettings.js
+++ /dev/null
@@ -1,18 +0,0 @@
-module.exports = {
-    "name": "BillSettings",
-    "label": "Bill Settings",
-    "doctype": "DocType",
-    "isSingle": 1,
-    "isChild": 0,
-    "keywordFields": [],
-    "fields": [
-        {
-            "fieldname": "numberSeries",
-            "label": "Number Series",
-            "fieldtype": "Link",
-            "target": "NumberSeries",
-            "required": 1,
-            "default": "BILL"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/models/doctype/DashboardChart/DashboardChart.js b/models/doctype/DashboardChart/DashboardChart.js
new file mode 100644
index 00000000..5a906124
--- /dev/null
+++ b/models/doctype/DashboardChart/DashboardChart.js
@@ -0,0 +1,24 @@
+module.exports = {
+  name: 'DashboardChart',
+  doctype: 'DocType',
+  isChild: 1,
+  fields: [
+    {
+      fieldname: 'account',
+      fieldtype: 'Link',
+      label: 'Account',
+      target: 'Account'
+    },
+    {
+      fieldname: 'type',
+      fieldtype: 'Select',
+      options: ['', 'Bar', 'Line', 'Percentage'],
+      label: 'Chart Type'
+    },
+    {
+      fieldname: 'color',
+      fieldtype: 'Data',
+      label: 'Color'
+    }
+  ]
+};
diff --git a/models/doctype/DashboardSettings/DashboardSettings.js b/models/doctype/DashboardSettings/DashboardSettings.js
new file mode 100644
index 00000000..065ca301
--- /dev/null
+++ b/models/doctype/DashboardSettings/DashboardSettings.js
@@ -0,0 +1,19 @@
+module.exports = {
+  name: 'Dashboard',
+  label: 'Dashboard Settings',
+  doctype: 'DocType',
+  isSingle: 1,
+  fields: [
+    {
+      fieldname: 'name',
+      fieldtype: 'Data',
+      label: 'Dashboard Name'
+    },
+    {
+      fieldname: 'charts',
+      fieldtype: 'Table',
+      label: 'Charts',
+      childtype: 'DashboardChart'
+    }
+  ]
+};
diff --git a/models/doctype/GSTR3B/GSTR3BDocument.js b/models/doctype/GSTR3B/GSTR3BDocument.js
index 9314caec..6e2722d1 100644
--- a/models/doctype/GSTR3B/GSTR3BDocument.js
+++ b/models/doctype/GSTR3B/GSTR3BDocument.js
@@ -28,25 +28,28 @@ module.exports = class GSTR3B extends BaseDocument {
         `${this.year}-${month}-${lastDate}`
       ]
     };
-    const invoices = frappe.db.getAll({
-      doctype: 'Invoice',
+    const salesInvoices = frappe.db.getAll({
+      doctype: 'SalesInvoice',
       filters,
       fields: ['*']
     });
-    const bills = frappe.db.getAll({
-      doctype: 'Bill',
+    const purchaseInvoices = frappe.db.getAll({
+      doctype: 'PurchaseInvoice',
       filters,
       fields: ['*']
     });
-    const [gstr1Data, gstr2Data] = await Promise.all([invoices, bills]);
+    const [gstr1Data, gstr2Data] = await Promise.all([
+      salesInvoices,
+      purchaseInvoices
+    ]);
     let gstr3bData = [[], []];
 
     for (let ledgerEntry of gstr1Data) {
-      ledgerEntry.doctype = 'Invoice';
+      ledgerEntry.doctype = 'SalesInvoice';
       gstr3bData[0].push(await this.makeGSTRow(ledgerEntry));
     }
     for (let ledgerEntry of gstr2Data) {
-      ledgerEntry.doctype = 'Bill';
+      ledgerEntry.doctype = 'BiPurchaseInvoicell';
       gstr3bData[1].push(await this.makeGSTRow(ledgerEntry));
     }
 
diff --git a/models/doctype/InvoiceSettings/InvoiceSettings.js b/models/doctype/InvoiceSettings/InvoiceSettings.js
deleted file mode 100644
index b7607f40..00000000
--- a/models/doctype/InvoiceSettings/InvoiceSettings.js
+++ /dev/null
@@ -1,42 +0,0 @@
-module.exports = {
-    name: "InvoiceSettings",
-    label: "Invoice Settings",
-    doctype: "DocType",
-    isSingle: 1,
-    isChild: 0,
-    keywordFields: [],
-    fields: [
-        {
-            fieldname: "numberSeries",
-            label: "Number Series",
-            fieldtype: "Link",
-            target: "NumberSeries",
-            required: 1,
-            default: "INV"
-        },
-        {
-            fieldname: "template",
-            label: "Template",
-            fieldtype: "Select",
-            options: ["Basic I", "Basic II", "Modern"],
-            required: 1,
-            default: "Basic I" 
-        },
-        {
-            fieldname: "font",
-            label: "Font",
-            fieldtype: "Select",
-            options: ["Montserrat", "Open Sans", "Oxygen", "Merriweather"],
-            required: 1,
-            default: "Montserrat" 
-        },
-        {
-            fieldname: "themeColor",
-            label: "Theme Color",
-            fieldtype: "Data",
-            required: 1,
-            default: "#000000",
-            hidden: 1
-        }
-    ]
-}
\ No newline at end of file
diff --git a/models/doctype/Party/Party.js b/models/doctype/Party/Party.js
index 2ffe40e2..9d4c57b0 100644
--- a/models/doctype/Party/Party.js
+++ b/models/doctype/Party/Party.js
@@ -44,7 +44,7 @@ module.exports = {
 
   links: [
     {
-      label: 'Invoices',
+      label: 'Sales Invoices',
       condition: form => form.doc.customer,
       action: form => {
         form.$router.push({
@@ -52,6 +52,15 @@ module.exports = {
         });
       }
     },
+    {
+      label: 'Purchase Invoices',
+      condition: form => form.doc.supplier,
+      action: form => {
+        form.$router.push({
+          path: `/report/purchase-register?&supplier=${form.doc.name}`
+        });
+      }
+    },
     {
       label: 'Delete',
       condition: form => form.doc.customer,
diff --git a/models/doctype/Payment/PaymentServer.js b/models/doctype/Payment/PaymentServer.js
index caa4d37c..54449d46 100644
--- a/models/doctype/Payment/PaymentServer.js
+++ b/models/doctype/Payment/PaymentServer.js
@@ -15,7 +15,7 @@ module.exports = class PaymentServer extends BaseDocument {
   async beforeSubmit() {
     if (this.for.length > 0)
       for (let row of this.for) {
-        if (['Invoice', 'Bill'].includes(row.referenceType)) {
+        if (['SalesInvoice', 'PurchaseInvoice'].includes(row.referenceType)) {
           let { outstandingAmount, grandTotal } = await frappe.getDoc(
             row.referenceType,
             row.referenceName
diff --git a/models/doctype/Bill/Bill.js b/models/doctype/PurchaseInvoice/PurchaseInvoice.js
similarity index 94%
rename from models/doctype/Bill/Bill.js
rename to models/doctype/PurchaseInvoice/PurchaseInvoice.js
index bbe27c32..c894db3e 100644
--- a/models/doctype/Bill/Bill.js
+++ b/models/doctype/PurchaseInvoice/PurchaseInvoice.js
@@ -2,14 +2,15 @@ const frappe = require('frappejs');
 const utils = require('../../../accounting/utils');
 
 module.exports = {
-  name: 'Bill',
+  name: 'PurchaseInvoice',
   doctype: 'DocType',
-  documentClass: require('./BillDocument'),
+  label: 'Purchase Invoice',
+  documentClass: require('./PurchaseInvoiceDocument'),
   isSingle: 0,
   isChild: 0,
   isSubmittable: 1,
   keywordFields: ['name', 'supplier'],
-  settings: 'BillSettings',
+  settings: 'PurchaseInvoiceSettings',
   showTitle: true,
   fields: [
     {
@@ -50,7 +51,7 @@ module.exports = {
       fieldname: 'items',
       label: 'Items',
       fieldtype: 'Table',
-      childtype: 'BillItem',
+      childtype: 'PurchaseInvoiceItem',
       required: true
     },
     {
diff --git a/models/doctype/PurchaseInvoice/PurchaseInvoiceDocument.js b/models/doctype/PurchaseInvoice/PurchaseInvoiceDocument.js
new file mode 100644
index 00000000..b2752ec2
--- /dev/null
+++ b/models/doctype/PurchaseInvoice/PurchaseInvoiceDocument.js
@@ -0,0 +1,4 @@
+const SalesInvoiceDocument = require('../SalesInvoice/SalesInvoiceDocument');
+const frappe = require('frappejs');
+
+module.exports = class PurchaseInvoice extends SalesInvoiceDocument {};
diff --git a/models/doctype/Bill/BillList.js b/models/doctype/PurchaseInvoice/PurchaseInvoiceList.js
similarity index 90%
rename from models/doctype/Bill/BillList.js
rename to models/doctype/PurchaseInvoice/PurchaseInvoiceList.js
index ed97ce51..5ce2f04e 100644
--- a/models/doctype/Bill/BillList.js
+++ b/models/doctype/PurchaseInvoice/PurchaseInvoiceList.js
@@ -2,8 +2,8 @@ import { _ } from 'frappejs/utils';
 import indicators from 'frappejs/ui/constants/indicators';
 
 export default {
-  doctype: 'Bill',
-  title: _('Bill'),
+  doctype: 'PurchaseInvoice',
+  title: _('Purchase Invoice'),
   columns: [
     'supplier',
     {
diff --git a/models/doctype/Bill/BillServer.js b/models/doctype/PurchaseInvoice/PurchaseInvoiceServer.js
similarity index 90%
rename from models/doctype/Bill/BillServer.js
rename to models/doctype/PurchaseInvoice/PurchaseInvoiceServer.js
index fbfa4d01..15d67acc 100644
--- a/models/doctype/Bill/BillServer.js
+++ b/models/doctype/PurchaseInvoice/PurchaseInvoiceServer.js
@@ -1,8 +1,8 @@
 const frappe = require('frappejs');
-const Bill = require('./BillDocument');
+const PurchaseInvoice = require('./PurchaseInvoiceDocument');
 const LedgerPosting = require('../../../accounting/ledgerPosting');
 
-module.exports = class BillServer extends Bill {
+module.exports = class PurchaseInvoiceServer extends PurchaseInvoice {
   async getPosting() {
     let entries = new LedgerPosting({ reference: this, party: this.supplier });
     await entries.credit(this.account, this.grandTotal);
@@ -36,7 +36,7 @@ module.exports = class BillServer extends Bill {
     const entries = await this.getPosting();
     await entries.post();
     await frappe.db.setValue(
-      'Bill',
+      'PurchaseInvoice',
       this.name,
       'outstandingAmount',
       this.grandTotal
diff --git a/models/doctype/BillItem/BillItem.js b/models/doctype/PurchaseInvoiceItem/PurchaseInvoiceItem.js
similarity index 95%
rename from models/doctype/BillItem/BillItem.js
rename to models/doctype/PurchaseInvoiceItem/PurchaseInvoiceItem.js
index 0753639a..d17572fb 100644
--- a/models/doctype/BillItem/BillItem.js
+++ b/models/doctype/PurchaseInvoiceItem/PurchaseInvoiceItem.js
@@ -1,5 +1,6 @@
 module.exports = {
-  name: 'BillItem',
+  name: 'PurchaseInvoiceItem',
+  label: 'Purchase Invoice Item',
   doctype: 'DocType',
   isSingle: 0,
   isChild: 1,
diff --git a/models/doctype/PurchaseInvoiceSettings/PurchaseInvoiceSettings.js b/models/doctype/PurchaseInvoiceSettings/PurchaseInvoiceSettings.js
new file mode 100644
index 00000000..663bc7fa
--- /dev/null
+++ b/models/doctype/PurchaseInvoiceSettings/PurchaseInvoiceSettings.js
@@ -0,0 +1,18 @@
+module.exports = {
+  name: 'PurchaseInvoiceSettings',
+  label: 'Purchase Invoice Settings',
+  doctype: 'DocType',
+  isSingle: 1,
+  isChild: 0,
+  keywordFields: [],
+  fields: [
+    {
+      fieldname: 'numberSeries',
+      label: 'Number Series',
+      fieldtype: 'Link',
+      target: 'NumberSeries',
+      required: 1,
+      default: 'PINV'
+    }
+  ]
+};
diff --git a/models/doctype/PurchaseOrder/PurchaseOrder.js b/models/doctype/PurchaseOrder/PurchaseOrder.js
index a973d86d..7eba77d1 100644
--- a/models/doctype/PurchaseOrder/PurchaseOrder.js
+++ b/models/doctype/PurchaseOrder/PurchaseOrder.js
@@ -1,16 +1,20 @@
 const model = require('frappejs/model');
-const Bill = require('../Bill/Bill');
+const PurchaseInvoice = require('../PurchaseInvoice/PurchaseInvoice');
 
-module.exports = model.extend(Bill, {
-    name: "PurchaseOrder",
-    label: "Purchase Order",
-    settings: "PurchaseOrderSettings",
+module.exports = model.extend(
+  PurchaseInvoice,
+  {
+    name: 'PurchaseOrder',
+    label: 'Purchase Order',
+    settings: 'PurchaseOrderSettings',
     fields: [
-        {
-            "fieldname": "items",
-            "childtype": "PurchaseOrderItem"
-        }
+      {
+        fieldname: 'items',
+        childtype: 'PurchaseOrderItem'
+      }
     ]
-}, {
+  },
+  {
     skipFields: ['account']
-});
+  }
+);
diff --git a/models/doctype/PurchaseOrderItem/PurchaseOrderItem.js b/models/doctype/PurchaseOrderItem/PurchaseOrderItem.js
index ad72ffee..140aba73 100644
--- a/models/doctype/PurchaseOrderItem/PurchaseOrderItem.js
+++ b/models/doctype/PurchaseOrderItem/PurchaseOrderItem.js
@@ -1,6 +1,6 @@
 const model = require('frappejs/model');
-const BillItem = require('../BillItem/BillItem');
+const PurchaseInvoiceItem = require('../PurchaseInvoiceItem/PurchaseInvoiceItem');
 
-module.exports = model.extend(BillItem, {
+module.exports = model.extend(PurchaseInvoiceItem, {
     name: "PurchaseOrderItem"
 });
diff --git a/models/doctype/PurchaseOrderSettings/PurchaseOrderSettings.js b/models/doctype/PurchaseOrderSettings/PurchaseOrderSettings.js
index 928eb542..b7100db1 100644
--- a/models/doctype/PurchaseOrderSettings/PurchaseOrderSettings.js
+++ b/models/doctype/PurchaseOrderSettings/PurchaseOrderSettings.js
@@ -1,7 +1,7 @@
 const model = require('frappejs/model');
-const BillSettings = require('../BillSettings/BillSettings');
+const PurchaseInvoiceSettings = require('../PurchaseInvoiceSettings/PurchaseInvoiceSettings');
 
-module.exports = model.extend(BillSettings, {
+module.exports = model.extend(PurchaseInvoiceSettings, {
     "name": "PurchaseOrderSettings",
     "label": "Purchase Order Settings",
     "fields": [
diff --git a/models/doctype/Invoice/Invoice.js b/models/doctype/SalesInvoice/SalesInvoice.js
similarity index 95%
rename from models/doctype/Invoice/Invoice.js
rename to models/doctype/SalesInvoice/SalesInvoice.js
index 4573c967..8b492e26 100644
--- a/models/doctype/Invoice/Invoice.js
+++ b/models/doctype/SalesInvoice/SalesInvoice.js
@@ -2,9 +2,10 @@ const frappe = require('frappejs');
 const utils = require('../../../accounting/utils');
 
 module.exports = {
-  name: 'Invoice',
+  name: 'SalesInvoice',
+  label: 'Sales Invoice',
   doctype: 'DocType',
-  documentClass: require('./InvoiceDocument.js'),
+  documentClass: require('./SalesInvoiceDocument'),
   print: {
     printFormat: 'Standard Invoice Format'
   },
@@ -12,7 +13,7 @@ module.exports = {
   isChild: 0,
   isSubmittable: 1,
   keywordFields: ['name', 'customer'],
-  settings: 'InvoiceSettings',
+  settings: 'SalesInvoiceSettings',
   showTitle: true,
   fields: [
     {
@@ -62,7 +63,7 @@ module.exports = {
       fieldname: 'items',
       label: 'Items',
       fieldtype: 'Table',
-      childtype: 'InvoiceItem',
+      childtype: 'SalesInvoiceItem',
       required: true
     },
     {
diff --git a/models/doctype/Invoice/InvoiceDocument.js b/models/doctype/SalesInvoice/SalesInvoiceDocument.js
similarity index 97%
rename from models/doctype/Invoice/InvoiceDocument.js
rename to models/doctype/SalesInvoice/SalesInvoiceDocument.js
index ba20a2d5..a84a15ef 100644
--- a/models/doctype/Invoice/InvoiceDocument.js
+++ b/models/doctype/SalesInvoice/SalesInvoiceDocument.js
@@ -1,7 +1,7 @@
 const BaseDocument = require('frappejs/model/document');
 const frappe = require('frappejs');
 
-module.exports = class Invoice extends BaseDocument {
+module.exports = class SalesInvoice extends BaseDocument {
   async getRowTax(row) {
     if (row.tax) {
       let tax = await this.getTax(row.tax);
diff --git a/models/doctype/Invoice/InvoiceList.js b/models/doctype/SalesInvoice/SalesInvoiceList.js
similarity index 91%
rename from models/doctype/Invoice/InvoiceList.js
rename to models/doctype/SalesInvoice/SalesInvoiceList.js
index 194052b6..0bf3b839 100644
--- a/models/doctype/Invoice/InvoiceList.js
+++ b/models/doctype/SalesInvoice/SalesInvoiceList.js
@@ -2,8 +2,8 @@ import { _ } from 'frappejs/utils';
 import indicators from 'frappejs/ui/constants/indicators';
 
 export default {
-  doctype: 'Invoice',
-  title: _('Invoice'),
+  doctype: 'SalesInvoice',
+  title: _('Sales Invoice'),
   columns: [
     'customer',
     {
diff --git a/models/doctype/Invoice/InvoicePrint.vue b/models/doctype/SalesInvoice/SalesInvoicePrint.vue
similarity index 90%
rename from models/doctype/Invoice/InvoicePrint.vue
rename to models/doctype/SalesInvoice/SalesInvoicePrint.vue
index 6dc92d7f..0f985d7d 100644
--- a/models/doctype/Invoice/InvoicePrint.vue
+++ b/models/doctype/SalesInvoice/SalesInvoicePrint.vue
@@ -26,9 +26,9 @@
   </div>
 </template>
 <script>
-import InvoiceTemplate1 from '@/../models/doctype/Invoice/Templates/InvoiceTemplate1';
-import InvoiceTemplate2 from '@/../models/doctype/Invoice/Templates/InvoiceTemplate2';
-import InvoiceTemplate3 from '@/../models/doctype/Invoice/Templates/InvoiceTemplate3';
+import InvoiceTemplate1 from '@/../models/doctype/SalesInvoice/Templates/InvoiceTemplate1';
+import InvoiceTemplate2 from '@/../models/doctype/SalesInvoice/Templates/InvoiceTemplate2';
+import InvoiceTemplate3 from '@/../models/doctype/SalesInvoice/Templates/InvoiceTemplate3';
 import InvoiceCustomizer from '@/components/InvoiceCustomizer';
 
 const invoiceTemplates = {
diff --git a/models/doctype/Invoice/InvoiceServer.js b/models/doctype/SalesInvoice/SalesInvoiceServer.js
similarity index 91%
rename from models/doctype/Invoice/InvoiceServer.js
rename to models/doctype/SalesInvoice/SalesInvoiceServer.js
index 7bca6686..a833d239 100644
--- a/models/doctype/Invoice/InvoiceServer.js
+++ b/models/doctype/SalesInvoice/SalesInvoiceServer.js
@@ -1,7 +1,7 @@
-const Invoice = require('./InvoiceDocument');
+const SalesInvoice = require('./SalesInvoiceDocument');
 const LedgerPosting = require('../../../accounting/ledgerPosting');
 
-module.exports = class InvoiceServer extends Invoice {
+module.exports = class SalesInvoiceServer extends SalesInvoice {
   async getPosting() {
     let entries = new LedgerPosting({ reference: this, party: this.customer });
     await entries.debit(this.account, this.grandTotal);
@@ -35,7 +35,7 @@ module.exports = class InvoiceServer extends Invoice {
     const entries = await this.getPosting();
     await entries.post();
     await frappe.db.setValue(
-      'Invoice',
+      'SalesInvoice',
       this.name,
       'outstandingAmount',
       this.grandTotal
diff --git a/models/doctype/Invoice/Templates/AddressDetails.js b/models/doctype/SalesInvoice/Templates/AddressDetails.js
similarity index 100%
rename from models/doctype/Invoice/Templates/AddressDetails.js
rename to models/doctype/SalesInvoice/Templates/AddressDetails.js
diff --git a/models/doctype/Invoice/Templates/CompanyAddress.vue b/models/doctype/SalesInvoice/Templates/CompanyAddress.vue
similarity index 100%
rename from models/doctype/Invoice/Templates/CompanyAddress.vue
rename to models/doctype/SalesInvoice/Templates/CompanyAddress.vue
diff --git a/models/doctype/Invoice/Templates/CustomerAddress.vue b/models/doctype/SalesInvoice/Templates/CustomerAddress.vue
similarity index 100%
rename from models/doctype/Invoice/Templates/CustomerAddress.vue
rename to models/doctype/SalesInvoice/Templates/CustomerAddress.vue
diff --git a/models/doctype/Invoice/Templates/InvoiceStyles.js b/models/doctype/SalesInvoice/Templates/InvoiceStyles.js
similarity index 100%
rename from models/doctype/Invoice/Templates/InvoiceStyles.js
rename to models/doctype/SalesInvoice/Templates/InvoiceStyles.js
diff --git a/models/doctype/Invoice/Templates/InvoiceTemplate1.vue b/models/doctype/SalesInvoice/Templates/InvoiceTemplate1.vue
similarity index 100%
rename from models/doctype/Invoice/Templates/InvoiceTemplate1.vue
rename to models/doctype/SalesInvoice/Templates/InvoiceTemplate1.vue
diff --git a/models/doctype/Invoice/Templates/InvoiceTemplate2.vue b/models/doctype/SalesInvoice/Templates/InvoiceTemplate2.vue
similarity index 100%
rename from models/doctype/Invoice/Templates/InvoiceTemplate2.vue
rename to models/doctype/SalesInvoice/Templates/InvoiceTemplate2.vue
diff --git a/models/doctype/Invoice/Templates/InvoiceTemplate3.vue b/models/doctype/SalesInvoice/Templates/InvoiceTemplate3.vue
similarity index 100%
rename from models/doctype/Invoice/Templates/InvoiceTemplate3.vue
rename to models/doctype/SalesInvoice/Templates/InvoiceTemplate3.vue
diff --git a/models/doctype/InvoiceItem/InvoiceItem.js b/models/doctype/SalesInvoiceItem/SalesInvoiceItem.js
similarity index 98%
rename from models/doctype/InvoiceItem/InvoiceItem.js
rename to models/doctype/SalesInvoiceItem/SalesInvoiceItem.js
index 5890aabb..b96cdf2e 100644
--- a/models/doctype/InvoiceItem/InvoiceItem.js
+++ b/models/doctype/SalesInvoiceItem/SalesInvoiceItem.js
@@ -1,5 +1,5 @@
 module.exports = {
-  name: 'InvoiceItem',
+  name: 'SalesInvoiceItem',
   doctype: 'DocType',
   isSingle: 0,
   isChild: 1,
diff --git a/models/doctype/SalesInvoiceSettings/SalesInvoiceSettings.js b/models/doctype/SalesInvoiceSettings/SalesInvoiceSettings.js
new file mode 100644
index 00000000..35aa42a4
--- /dev/null
+++ b/models/doctype/SalesInvoiceSettings/SalesInvoiceSettings.js
@@ -0,0 +1,42 @@
+module.exports = {
+  name: 'SalesInvoiceSettings',
+  label: 'SalesInvoice Settings',
+  doctype: 'DocType',
+  isSingle: 1,
+  isChild: 0,
+  keywordFields: [],
+  fields: [
+    {
+      fieldname: 'numberSeries',
+      label: 'Number Series',
+      fieldtype: 'Link',
+      target: 'NumberSeries',
+      required: 1,
+      default: 'SINV'
+    },
+    {
+      fieldname: 'template',
+      label: 'Template',
+      fieldtype: 'Select',
+      options: ['Basic I', 'Basic II', 'Modern'],
+      required: 1,
+      default: 'Basic I'
+    },
+    {
+      fieldname: 'font',
+      label: 'Font',
+      fieldtype: 'Select',
+      options: ['Montserrat', 'Open Sans', 'Oxygen', 'Merriweather'],
+      required: 1,
+      default: 'Montserrat'
+    },
+    {
+      fieldname: 'themeColor',
+      label: 'Theme Color',
+      fieldtype: 'Data',
+      required: 1,
+      default: '#000000',
+      hidden: 1
+    }
+  ]
+};
diff --git a/models/index.js b/models/index.js
index ab7231bf..ed601b26 100644
--- a/models/index.js
+++ b/models/index.js
@@ -1,6 +1,8 @@
 module.exports = {
   models: {
     SetupWizard: require('./doctype/SetupWizard/SetupWizard'),
+    DashboardSettings: require('./doctype/DashboardSettings/DashboardSettings'),
+    DashboardChart: require('./doctype/DashboardChart/DashboardChart'),
     Account: require('./doctype/Account/Account.js'),
     AccountingSettings: require('./doctype/AccountingSettings/AccountingSettings'),
     CompanySettings: require('./doctype/CompanySettings/CompanySettings'),
@@ -13,13 +15,13 @@ module.exports = {
 
     Item: require('./doctype/Item/Item.js'),
 
-    Invoice: require('./doctype/Invoice/Invoice.js'),
-    InvoiceItem: require('./doctype/InvoiceItem/InvoiceItem.js'),
-    InvoiceSettings: require('./doctype/InvoiceSettings/InvoiceSettings.js'),
+    SalesInvoice: require('./doctype/SalesInvoice/SalesInvoice.js'),
+    SalesInvoiceItem: require('./doctype/SalesInvoiceItem/SalesInvoiceItem.js'),
+    SalesInvoiceSettings: require('./doctype/SalesInvoiceSettings/SalesInvoiceSettings.js'),
 
-    Bill: require('./doctype/Bill/Bill.js'),
-    BillItem: require('./doctype/BillItem/BillItem.js'),
-    BillSettings: require('./doctype/BillSettings/BillSettings.js'),
+    PurchaseInvoice: require('./doctype/PurchaseInvoice/PurchaseInvoice.js'),
+    PurchaseInvoiceItem: require('./doctype/PurchaseInvoiceItem/PurchaseInvoiceItem.js'),
+    PurchaseInvoiceSettings: require('./doctype/PurchaseInvoiceSettings/PurchaseInvoiceSettings.js'),
 
     Tax: require('./doctype/Tax/Tax.js'),
     TaxDetail: require('./doctype/TaxDetail/TaxDetail.js'),
diff --git a/package.json b/package.json
index b7611782..32f5d6ea 100644
--- a/package.json
+++ b/package.json
@@ -60,6 +60,7 @@
   "dependencies": {
     "cross-env": "^5.2.0",
     "file-saver": "^2.0.2",
+    "frappe-charts": "^1.2.4",
     "frappejs": "github:thefalconx33/frappejs#test",
     "nodemailer": "^4.7.0",
     "popper.js": "^1.14.4",
diff --git a/reports/AccountsReceivablePayable/AccountsReceivablePayable.js b/reports/AccountsReceivablePayable/AccountsReceivablePayable.js
index fa628931..8eff2898 100644
--- a/reports/AccountsReceivablePayable/AccountsReceivablePayable.js
+++ b/reports/AccountsReceivablePayable/AccountsReceivablePayable.js
@@ -1,154 +1,170 @@
 const frappe = require('frappejs');
 
 module.exports = class AccountsReceivablePayable {
-    async run(reportType, { date }) {
+  async run(reportType, { date }) {
+    const rows = await getReceivablePayable({
+      reportType,
+      date
+    });
 
-        const rows = await getReceivablePayable({
-            reportType,
-            date
-        });
-
-        return { rows };
-    }
-}
+    return { rows };
+  }
+};
 
 async function getReceivablePayable({ reportType = 'Receivable', date }) {
-    let entries = [];
-    const debitOrCredit = reportType === 'Receivable' ? 'debit' : 'credit';
-    const referenceType = reportType === 'Receivable' ? 'Invoice' : 'Bill';
+  let entries = [];
+  const debitOrCredit = reportType === 'Receivable' ? 'debit' : 'credit';
+  const referenceType =
+    reportType === 'Receivable' ? 'SalesInvoice' : 'PurchaseInvoice';
 
-    entries = await getLedgerEntries();
-    const vouchers = await getVouchers();
+  entries = await getLedgerEntries();
+  const vouchers = await getVouchers();
 
-    const futureEntries = getFutureEntries();
-    const returnEntries = getReturnEntries();
-    const pdc = getPDC();
+  const futureEntries = getFutureEntries();
+  const returnEntries = getReturnEntries();
+  const pdc = getPDC();
 
-    const validEntries = getValidEntries();
+  const validEntries = getValidEntries();
 
-    let data = [];
+  let data = [];
 
-    for (let entry of validEntries) {
+  for (let entry of validEntries) {
+    const { outStandingAmount, creditNoteAmount } = getOutstandingAmount(entry);
 
-        const { outStandingAmount, creditNoteAmount } = getOutstandingAmount(entry);
+    console.log(outStandingAmount);
 
-        console.log(outStandingAmount);
+    if (outStandingAmount > 0.1 / 10) {
+      const row = {
+        date: entry.date,
+        party: entry.party
+      };
 
-        if (outStandingAmount > 0.1 / 10) {
-            const row = {
-                date: entry.date,
-                party: entry.party
-            };
+      // due date / bill date
 
-            // due date / bill date
+      row.voucherType = entry.referenceType;
+      row.voucherNo = entry.referenceName;
 
-            row.voucherType = entry.referenceType;
-            row.voucherNo = entry.referenceName;
+      // bill details
 
-            // bill details
+      const invoicedAmount = entry[debitOrCredit] || 0;
+      const paidAmount = invoicedAmount - outStandingAmount - creditNoteAmount;
 
-            const invoicedAmount = entry[debitOrCredit] || 0;
-            const paidAmount = invoicedAmount - outStandingAmount - creditNoteAmount;
+      Object.assign(row, {
+        invoicedAmount,
+        paidAmount,
+        outStandingAmount,
+        creditNoteAmount
+      });
 
-            Object.assign(row, {
-                invoicedAmount,
-                paidAmount,
-                outStandingAmount,
-                creditNoteAmount
-            });
+      // ageing
 
-            // ageing
+      data.push(row);
+    }
+  }
 
-            data.push(row);
+  return data;
+
+  // helpers
+
+  async function getVouchers() {
+    return await frappe.db.getAll({
+      doctype: referenceType,
+      fields: ['name', 'date'],
+      filters: {
+        submitted: 1
+      }
+    });
+  }
+
+  function getValidEntries() {
+    return entries.filter(entry => {
+      return (
+        entry.date <= date &&
+        entry.referenceType === referenceType &&
+        entry[debitOrCredit] > 0
+      );
+    });
+  }
+
+  function getOutstandingAmount(entry) {
+    let paymentAmount = 0.0,
+      creditNoteAmount = 0.0;
+    let reverseDebitOrCredit = debitOrCredit === 'debit' ? 'credit' : 'debit';
+
+    for (let e of getEntriesFor(
+      entry.party,
+      entry.referenceType,
+      entry.referenceName
+    )) {
+      if (e.date <= date) {
+        const amount = e[reverseDebitOrCredit] - e[debitOrCredit];
+
+        if (!Object.keys(returnEntries).includes(e.referenceName)) {
+          paymentAmount += amount;
+        } else {
+          creditNoteAmount += amount;
         }
+      }
     }
 
-    return data;
+    return {
+      outStandingAmount:
+        entry[debitOrCredit] -
+        entry[reverseDebitOrCredit] -
+        paymentAmount -
+        creditNoteAmount,
+      creditNoteAmount
+    };
+  }
 
-    // helpers
+  function getEntriesFor(party, againstVoucherType, againstVoucher) {
+    // TODO
+    return [];
+  }
 
-    async function getVouchers() {
-        return await frappe.db.getAll({
-            doctype: referenceType,
-            fields: ['name', 'date'],
-            filters: {
-                submitted: 1
-            }
-        });
+  function getFutureEntries() {
+    return entries.filter(entry => entry.date > date);
+  }
+
+  function getReturnEntries() {
+    // TODO
+    return {};
+  }
+
+  function getPDC() {
+    return [];
+  }
+
+  async function getLedgerEntries() {
+    if (entries.length) {
+      return entries;
     }
 
-    function getValidEntries() {
-        return entries.filter(entry => {
-            return (
-                entry.date <= date &&
-                entry.referenceType === referenceType && entry[debitOrCredit] > 0
-            );
-        });
-    }
+    const partyType = reportType === 'Receivable' ? 'customer' : 'supplier';
+    const partyList = (await frappe.db.getAll({
+      doctype: 'Party',
+      filters: {
+        [partyType]: 1
+      }
+    })).map(d => d.name);
 
-    function getOutstandingAmount(entry) {
-        let paymentAmount = 0.0, creditNoteAmount = 0.0;
-        let reverseDebitOrCredit = debitOrCredit === 'debit' ? 'credit' : 'debit';
-
-        for (let e of getEntriesFor(entry.party, entry.referenceType, entry.referenceName)) {
-            if (e.date <= date) {
-                const amount = e[reverseDebitOrCredit] - e[debitOrCredit];
-
-                if (!Object.keys(returnEntries).includes(e.referenceName)) {
-                    paymentAmount += amount;
-                } else {
-                    creditNoteAmount += amount;
-                }
-            }
-        }
-
-        return {
-            outStandingAmount: (entry[debitOrCredit] - entry[reverseDebitOrCredit]) - paymentAmount - creditNoteAmount,
-            creditNoteAmount
-        }
-    }
-
-    function getEntriesFor(party, againstVoucherType, againstVoucher) {
-        // TODO
-        return []
-    }
-
-    function getFutureEntries() {
-        return entries.filter(entry => entry.date > date);
-    }
-
-    function getReturnEntries() {
-        // TODO
-        return {};
-    }
-
-    function getPDC() {
-        return [];
-    }
-
-    async function getLedgerEntries() {
-        if (entries.length) {
-            return entries;
-        }
-
-        const partyType = reportType === 'Receivable' ? 'customer': 'supplier'
-        const partyList = (await frappe.db.getAll({
-            doctype: 'Party',
-            filters: {
-                [partyType]: 1
-            }
-        })).map(d => d.name);
-
-        return await frappe.db.getAll({
-            doctype: 'AccountingLedgerEntry',
-            fields: ['name', 'date', 'account', 'party',
-                'referenceType', 'referenceName',
-                'sum(debit) as debit', 'sum(credit) as credit'],
-            filters: {
-                party: ['in', partyList]
-            },
-            groupBy: ['referenceType', 'referenceName', 'party'],
-            orderBy: 'date'
-        });
-    }
+    return await frappe.db.getAll({
+      doctype: 'AccountingLedgerEntry',
+      fields: [
+        'name',
+        'date',
+        'account',
+        'party',
+        'referenceType',
+        'referenceName',
+        'sum(debit) as debit',
+        'sum(credit) as credit'
+      ],
+      filters: {
+        party: ['in', partyList]
+      },
+      groupBy: ['referenceType', 'referenceName', 'party'],
+      orderBy: 'date'
+    });
+  }
 }
diff --git a/reports/GeneralLedger/GeneralLedgerView.js b/reports/GeneralLedger/GeneralLedgerView.js
index b21362d8..dedf4027 100644
--- a/reports/GeneralLedger/GeneralLedgerView.js
+++ b/reports/GeneralLedger/GeneralLedgerView.js
@@ -8,7 +8,7 @@ module.exports = class GeneralLedgerView extends ReportPage {
       filterFields: [
         {
           fieldtype: 'Select',
-          options: ['', 'Invoice', 'Payment'],
+          options: ['', 'SalesInvoice', 'Payment'],
           label: 'Reference Type',
           fieldname: 'referenceType'
         },
diff --git a/reports/GeneralLedger/viewConfig.js b/reports/GeneralLedger/viewConfig.js
index 20f79582..62790316 100644
--- a/reports/GeneralLedger/viewConfig.js
+++ b/reports/GeneralLedger/viewConfig.js
@@ -5,7 +5,7 @@ const viewConfig = {
   filterFields: [
     {
       fieldtype: 'Select',
-      options: ['', 'Invoice', 'Payment', 'Bill'],
+      options: ['', 'SalesInvoice', 'Payment', 'PurchaseInvoice'],
       label: 'Reference Type',
       fieldname: 'referenceType'
     },
diff --git a/reports/GoodsAndServiceTax/BaseGSTR.js b/reports/GoodsAndServiceTax/BaseGSTR.js
index 2996e3ea..3bbc62a2 100644
--- a/reports/GoodsAndServiceTax/BaseGSTR.js
+++ b/reports/GoodsAndServiceTax/BaseGSTR.js
@@ -4,13 +4,13 @@ class BaseGSTR {
   async getCompleteReport(gstrType, filters) {
     if (['GSTR-1', 'GSTR-2'].includes(gstrType)) {
       let entries = await frappe.db.getAll({
-        doctype: gstrType === 'GSTR-1' ? 'Invoice' : 'Bill',
+        doctype: gstrType === 'GSTR-1' ? 'SalesInvoice' : 'PurchaseInvoice',
         filters
       });
 
       let tableData = [];
       for (let entry of entries) {
-        entry.doctype = gstrType === 'GSTR-1' ? 'Invoice' : 'Bill';
+        entry.doctype = gstrType === 'GSTR-1' ? 'SalesInvoice' : 'PurchaseInvoice';
         const row = await this.getRow(entry);
         tableData.push(row);
       }
diff --git a/reports/PurchaseRegister/PurchaseRegister.js b/reports/PurchaseRegister/PurchaseRegister.js
index 26cfc9e9..4da42128 100644
--- a/reports/PurchaseRegister/PurchaseRegister.js
+++ b/reports/PurchaseRegister/PurchaseRegister.js
@@ -1,43 +1,54 @@
 const frappe = require('frappejs');
 
 class PurchaseRegister {
-    async run({ fromDate, toDate }) {
-        const bills = await frappe.db.getAll({
-            doctype: 'Bill',
-            fields: ['name', 'date', 'supplier', 'account', 'netTotal', 'grandTotal'],
-            filters: {
-                date: ['>=', fromDate, '<=', toDate],
-                submitted: 1
-            },
-            orderBy: 'date',
-            order: 'desc'
-        });
-
-        const billNames = bills.map(d => d.name);
-
-        const taxes = await frappe.db.getAll({
-            doctype: 'TaxSummary',
-            fields: ['parent', 'amount'],
-            filters: {
-                parenttype: 'Bill',
-                parent: ['in', billNames]
-            },
-            orderBy: 'name'
-        });
-
-        for (let bill of bills) {
-            bill.totalTax = taxes
-                .filter(tax => tax.parent === bill.name)
-                .reduce((acc, tax) => {
-                    if (tax.amount) {
-                        acc = acc + tax.amount;
-                    }
-                    return acc;
-                }, 0);
-        }
-
-        return { rows: bills };
+  async run({ fromDate, toDate, supplier }) {
+    let filters = {};
+    if (supplier) {
+      filters.supplier = supplier;
     }
+
+    if (fromDate && toDate) {
+      filters.date = ['>=', fromDate, '<=', toDate];
+    } else if (fromDate) {
+      filters.date = ['>=', fromDate];
+    } else if (toDate) {
+      filters.date = ['<=', toDate];
+    }
+    filters.submitted = 1;
+
+    const bills = await frappe.db.getAll({
+      doctype: 'PurchaseInvoice',
+      fields: ['name', 'date', 'supplier', 'account', 'netTotal', 'grandTotal'],
+      filters,
+      orderBy: 'date',
+      order: 'desc'
+    });
+
+    const billNames = bills.map(d => d.name);
+
+    const taxes = await frappe.db.getAll({
+      doctype: 'TaxSummary',
+      fields: ['parent', 'amount'],
+      filters: {
+        parenttype: 'PurchaseInvoice',
+        parent: ['in', billNames]
+      },
+      orderBy: 'name'
+    });
+
+    for (let bill of bills) {
+      bill.totalTax = taxes
+        .filter(tax => tax.parent === bill.name)
+        .reduce((acc, tax) => {
+          if (tax.amount) {
+            acc = acc + tax.amount;
+          }
+          return acc;
+        }, 0);
+    }
+
+    return { rows: bills };
+  }
 }
 
 module.exports = PurchaseRegister;
diff --git a/reports/PurchaseRegister/PurchaseRegisterView.js b/reports/PurchaseRegister/PurchaseRegisterView.js
index ae3f242b..8acc904e 100644
--- a/reports/PurchaseRegister/PurchaseRegisterView.js
+++ b/reports/PurchaseRegister/PurchaseRegisterView.js
@@ -2,23 +2,23 @@ const frappe = require('frappejs');
 const RegisterView = require('../Register/RegisterView');
 
 module.exports = class PurchaseRegisterView extends RegisterView {
-    constructor() {
-        super({
-            title: frappe._('Purchase Register'),
-        });
+  constructor() {
+    super({
+      title: frappe._('Purchase Register')
+    });
 
-        this.method = 'purchase-register';
-    }
+    this.method = 'purchase-register';
+  }
 
-    getColumns() {
-        return [
-            { label: 'Bill', fieldname: 'name' },
-            { label: 'Posting Date', fieldname: 'date' },
-            { label: 'Supplier', fieldname: 'supplier' },
-            { label: 'Payable Account', fieldname: 'account' },
-            { label: 'Net Total', fieldname: 'netTotal', fieldtype: 'Currency' },
-            { label: 'Total Tax', fieldname: 'totalTax', fieldtype: 'Currency' },
-            { label: 'Grand Total', fieldname: 'grandTotal', fieldtype: 'Currency' },
-        ];
-    }
-}
+  getColumns() {
+    return [
+      { label: 'PurchaseInvoice', fieldname: 'name' },
+      { label: 'Posting Date', fieldname: 'date' },
+      { label: 'Supplier', fieldname: 'supplier' },
+      { label: 'Payable Account', fieldname: 'account' },
+      { label: 'Net Total', fieldname: 'netTotal', fieldtype: 'Currency' },
+      { label: 'Total Tax', fieldname: 'totalTax', fieldtype: 'Currency' },
+      { label: 'Grand Total', fieldname: 'grandTotal', fieldtype: 'Currency' }
+    ];
+  }
+};
diff --git a/reports/PurchaseRegister/viewConfig.js b/reports/PurchaseRegister/viewConfig.js
new file mode 100644
index 00000000..5b6d9b34
--- /dev/null
+++ b/reports/PurchaseRegister/viewConfig.js
@@ -0,0 +1,42 @@
+const title = 'Purchase Register';
+module.exports = {
+  title: title,
+  method: 'purchase-register',
+  filterFields: [
+    {
+      fieldtype: 'Link',
+      target: 'Party',
+      label: 'Supplier Name',
+      fieldname: 'supplier',
+      getFilters: query => {
+        if (query)
+          return {
+            keywords: ['like', query],
+            supplier: 1
+          };
+
+        return {
+          supplier: 1
+        };
+      }
+    },
+    {
+      fieldtype: 'Date',
+      fieldname: 'fromDate',
+      label: 'From Date',
+      required: 1
+    },
+    { fieldtype: 'Date', fieldname: 'toDate', label: 'To Date', required: 1 }
+  ],
+  getColumns() {
+    return [
+      { label: 'PurchaseInvoice', fieldname: 'name' },
+      { label: 'Posting Date', fieldname: 'date' },
+      { label: 'Supplier', fieldname: 'supplier' },
+      { label: 'Payable Account', fieldname: 'account' },
+      { label: 'Net Total', fieldname: 'netTotal', fieldtype: 'Currency' },
+      { label: 'Total Tax', fieldname: 'totalTax', fieldtype: 'Currency' },
+      { label: 'Grand Total', fieldname: 'grandTotal', fieldtype: 'Currency' }
+    ];
+  }
+};
diff --git a/reports/SalesRegister/SalesRegisterView.js b/reports/SalesRegister/SalesRegisterView.js
index 693d0388..b79d9614 100644
--- a/reports/SalesRegister/SalesRegisterView.js
+++ b/reports/SalesRegister/SalesRegisterView.js
@@ -19,7 +19,7 @@ module.exports = class SalesRegisterView extends RegisterView {
 
     getColumns() {
         return [
-            { label: 'Invoice', fieldname: 'name' },
+            { label: 'SalesInvoice', fieldname: 'name' },
             { label: 'Posting Date', fieldname: 'date' , fieldtype: 'Date' },
             { label: 'Customer', fieldname: 'customer' },
             { label: 'Receivable Account', fieldname: 'account' },
diff --git a/reports/SalesRegister/viewConfig.js b/reports/SalesRegister/viewConfig.js
index 623a49f0..81029cfb 100644
--- a/reports/SalesRegister/viewConfig.js
+++ b/reports/SalesRegister/viewConfig.js
@@ -3,19 +3,40 @@ module.exports = {
   title: title,
   method: 'sales-register',
   filterFields: [
-    { fieldtype: 'Link', target: 'Party', label: 'Customer Name', fieldname: 'customer' },
-    { fieldtype: 'Date', fieldname: 'fromDate', label: 'From Date', required: 1 },
+    {
+      fieldtype: 'Link',
+      target: 'Party',
+      label: 'Customer Name',
+      fieldname: 'customer',
+      getFilters: query => {
+        if (query)
+          return {
+            keywords: ['like', query],
+            customer: 1
+          };
+
+        return {
+          customer: 1
+        };
+      }
+    },
+    {
+      fieldtype: 'Date',
+      fieldname: 'fromDate',
+      label: 'From Date',
+      required: 1
+    },
     { fieldtype: 'Date', fieldname: 'toDate', label: 'To Date', required: 1 }
   ],
   getColumns() {
     return [
-      { label: 'Invoice', fieldname: 'name' },
-      { label: 'Posting Date', fieldname: 'date' , fieldtype: 'Date' },
+      { label: 'SalesInvoice', fieldname: 'name' },
+      { label: 'Posting Date', fieldname: 'date', fieldtype: 'Date' },
       { label: 'Customer', fieldname: 'customer' },
       { label: 'Receivable Account', fieldname: 'account' },
       { label: 'Net Total', fieldname: 'netTotal', fieldtype: 'Currency' },
       { label: 'Total Tax', fieldname: 'totalTax', fieldtype: 'Currency' },
-      { label: 'Grand Total', fieldname: 'grandTotal', fieldtype: 'Currency' },
+      { label: 'Grand Total', fieldname: 'grandTotal', fieldtype: 'Currency' }
     ];
   }
 };
diff --git a/reports/view.js b/reports/view.js
index bb8667ab..bcb61feb 100644
--- a/reports/view.js
+++ b/reports/view.js
@@ -1,6 +1,7 @@
 module.exports = {
   'general-ledger': require('./GeneralLedger/viewConfig'),
   'sales-register': require('./SalesRegister/viewConfig'),
+  'purchase-register': require('./PurchaseRegister/viewConfig'),
   'profit-and-loss': require('./ProfitAndLoss/viewConfig'),
   'trial-balance': require('./TrialBalance/viewConfig'),
   'bank-reconciliation': require('./BankReconciliation/viewConfig'),
diff --git a/server/postStart.js b/server/postStart.js
index 58e259b4..df2bd9cb 100644
--- a/server/postStart.js
+++ b/server/postStart.js
@@ -4,9 +4,9 @@ const registerServerMethods = require('./registerServerMethods');
 
 module.exports = async function postStart() {
   // set server-side modules
-  frappe.models.Invoice.documentClass = require('../models/doctype/Invoice/InvoiceServer.js');
+  frappe.models.SalesInvoice.documentClass = require('../models/doctype/SalesInvoice/SalesInvoiceServer.js');
   frappe.models.Payment.documentClass = require('../models/doctype/Payment/PaymentServer.js');
-  frappe.models.Bill.documentClass = require('../models/doctype/Bill/BillServer.js');
+  frappe.models.PurchaseInvoice.documentClass = require('../models/doctype/PurchaseInvoice/PurchaseInvoiceServer.js');
   frappe.models.JournalEntry.documentClass = require('../models/doctype/JournalEntry/JournalEntryServer.js');
   frappe.models.GSTR3B.documentClass = require('../models/doctype/GSTR3B/GSTR3BServer.js');
 
@@ -15,8 +15,8 @@ module.exports = async function postStart() {
   frappe.syncDoc(require('../fixtures/invoicePrint'));
 
   // init naming series if missing
-  await naming.createNumberSeries('INV-', 'InvoiceSettings');
-  await naming.createNumberSeries('BILL-', 'BillSettings');
+  await naming.createNumberSeries('SINV-', 'SalesInvoiceSettings');
+  await naming.createNumberSeries('PINV-', 'PurchaseInvoiceSettings');
   await naming.createNumberSeries('PAY-', 'PaymentSettings');
   await naming.createNumberSeries('JV-', 'JournalEntrySettings');
   await naming.createNumberSeries('QTN-', 'QuotationSettings');
diff --git a/src/components/DashboardCard.vue b/src/components/DashboardCard.vue
new file mode 100644
index 00000000..2d74c2a1
--- /dev/null
+++ b/src/components/DashboardCard.vue
@@ -0,0 +1,26 @@
+<template>
+  <div class="col-6">
+    <div class="card mx-2 my-2">
+      <div class="card-body">
+        <div :ref="chartData.title"></div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { Chart } from 'frappe-charts';
+export default {
+  name: 'DashboardCard',
+  props: ['chartData'],
+  mounted() {
+    const chart = new Chart(this.$refs[this.chartData.title], {
+      title: this.chartData.title,
+      data: this.chartData.data,
+      type: this.chartData.type, // or 'bar', 'line', 'scatter', 'pie', 'percentage'
+      height: 250,
+      colors: [this.chartData.color]
+    });
+  }
+};
+</script>
diff --git a/src/components/InvoiceCustomizer.vue b/src/components/InvoiceCustomizer.vue
index 8c9d5c4d..e5907f56 100644
--- a/src/components/InvoiceCustomizer.vue
+++ b/src/components/InvoiceCustomizer.vue
@@ -3,7 +3,7 @@
     <div v-if="doc" class="p-4">
       <div class="row">
         <div class="col-6 text-center">
-          <h4>Customizer</h4>
+          <h4>Customize</h4>
         </div>
         <div class="col-6 text-right">
           <f-button secondary @click="saveAndClose">{{ _('Save & Close') }}</f-button>
@@ -36,9 +36,9 @@ export default {
     };
   },
   async created() {
-    this.doc = await frappe.getDoc('InvoiceSettings');
+    this.doc = await frappe.getDoc('SalesInvoiceSettings');
     this.color.hex = this.doc.themeColor;
-    const meta = frappe.getMeta('InvoiceSettings');
+    const meta = frappe.getMeta('SalesInvoiceSettings');
     this.fields = meta.fields.filter(
       field => field.fieldname !== 'numberSeries'
     );
diff --git a/src/components/PageHeader.vue b/src/components/PageHeader.vue
index a345b0a2..736d028c 100644
--- a/src/components/PageHeader.vue
+++ b/src/components/PageHeader.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="page-header px-4 py-3 border-bottom bg-white d-flex align-items-center">
+  <div
+    class="page-header px-4 py-2 border-bottom bg-white d-flex align-items-center justify-content-between"
+  >
     <h5 class="m-0" v-if="title">{{ title }}</h5>
     <div v-if="breadcrumbs">
       <a v-for="(item, index) in clickableBreadcrumbs" :key="index" :href="item.route">
@@ -10,11 +12,19 @@
       </a>
       <h5 class="breadCrumbRoute">{{ lastBreadcrumb.title }}</h5>
     </div>
+    <div class="col-4 p-0">
+      <SearchBar />
+    </div>
   </div>
 </template>
 <script>
+import SearchBar from './SearchBar';
+
 export default {
   props: ['title', 'breadcrumbs'],
+  components: {
+    SearchBar
+  },
   computed: {
     clickableBreadcrumbs() {
       return this.breadcrumbs.slice(0, this.breadcrumbs.length - 1);
diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue
new file mode 100644
index 00000000..c4b100c8
--- /dev/null
+++ b/src/components/SearchBar.vue
@@ -0,0 +1,152 @@
+<template>
+  <div>
+    <div class="input-group">
+      <div class="input-group-prepend">
+        <span class="input-group-text pt-0">
+          <feather-icon name="search" style="color: #212529 !important;"></feather-icon>
+        </span>
+      </div>
+      <input
+        type="search"
+        class="form-control"
+        placeholder="Search..."
+        autocomplete="off"
+        spellcheck="false"
+        v-model="inputValue"
+        @keyup.enter="search"
+        aria-label="Recipient's username"
+      />
+    </div>
+    <div v-if="inputValue" class="suggestion-list position-absolute shadow-sm" style="width: 100%">
+      <list-row
+        v-for="doc in suggestion"
+        :key="doc.name"
+        :class="doc.sep ? 'seperator': ''"
+        class="d-flex align-items-center"
+        @click.native="routeTo(doc.route)"
+      >
+        <span v-if="!doc.sep">
+          <feather-icon class="mr-1" name="minus" />
+        </span>
+        <div :class="doc.sep ? 'small' : ''">{{ doc.name }}</div>
+        <div class="small ml-auto">{{ doc.doctype }}</div>
+      </list-row>
+    </div>
+  </div>
+</template>
+<script>
+import frappe from 'frappejs';
+import ListRow from '../pages/ListView/ListRow';
+import ListCell from '../pages/ListView/ListCell';
+
+export default {
+  data() {
+    return {
+      inputValue: '',
+      suggestion: []
+    };
+  },
+  components: {
+    ListRow,
+    ListCell
+  },
+  watch: {
+    inputValue() {
+      if (!this.inputValue.length) this.suggestion = [];
+    }
+  },
+  methods: {
+    async search() {
+      const searchableDoctypes = frappe.getDoctypeList({
+        isSingle: 0,
+        isChild: 0
+      });
+      const documents = await this.getSearchedDocuments(searchableDoctypes);
+      const doctypes = await this.getSearchedDoctypes(searchableDoctypes);
+      this.suggestion = documents.concat(doctypes);
+      if (this.suggestion.length === 0)
+        this.suggestion = [{ sep: true, name: 'No results found.' }];
+    },
+    clearInput() {
+      this.inputValue = '';
+      this.$emit('change', null);
+    },
+    async getSearchedDocuments(searchableDoctypes) {
+      const promises = searchableDoctypes.map(doctype => {
+        return frappe.db.getAll({
+          doctype,
+          filters: { name: ['includes', this.inputValue] },
+          fields: ['name']
+        });
+      });
+      const data = await Promise.all(promises);
+      // data contains list of documents, sorted according to position of its doctype in searchableDoctypes
+      const items = [];
+      items.push({
+        sep: true,
+        name: 'Documents'
+      });
+      for (let i = 0; i < data.length; i++) {
+        // i represents doctype position in searchableDoctypes
+        if (data[i].length > 0) {
+          for (let doc of data[i]) {
+            let doctype = searchableDoctypes[i];
+            items.push({
+              doctype,
+              name: doc.name,
+              route: `/edit/${doctype}/${doc.name}`
+            });
+          }
+        }
+      }
+      if (items.length !== 1) return items;
+      return [];
+    },
+    getSearchedDoctypes(searchableDoctypes) {
+      const items = [{ sep: true, name: 'DocTypes' }];
+      let filteredDoctypes = searchableDoctypes.filter(doctype => {
+        return doctype.indexOf(this.inputValue) != -1;
+      });
+      filteredDoctypes = filteredDoctypes.map(doctype => {
+        return {
+          name: doctype,
+          route: `/list/${doctype}`
+        };
+      });
+      if (filteredDoctypes.length > 0) return items.concat(filteredDoctypes);
+      return [];
+    },
+    routeTo(route) {
+      this.$router.push(route);
+      this.inputValue = '';
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+@import '../styles/variables';
+.input-group-text {
+  background-color: var(--white);
+  border-right: none;
+}
+.seperator {
+  background-color: var(--light);
+}
+
+input {
+  border-left: none;
+  height: 27px;
+}
+
+input:focus {
+  border: 1px solid #ced4da;
+  border-left: none;
+  outline: none !important;
+  box-shadow: none !important;
+}
+.suggestion-list {
+  z-index: 2;
+}
+</style>
+
diff --git a/src/components/SearchInput.vue b/src/components/SearchInput.vue
deleted file mode 100644
index d30b5983..00000000
--- a/src/components/SearchInput.vue
+++ /dev/null
@@ -1,39 +0,0 @@
-<template>
-  <div class="input-group">
-    <input
-      type="search"
-      class="form-control"
-      placeholder="Search..."
-      autocomplete="off"
-      spellcheck="false"
-      v-model="inputValue"
-      @keyup.enter="$emit('change', inputValue)"
-      aria-label="Recipient's username"
-    >
-    <div class="input-group-append">
-      <button
-        class="btn btn-outline-secondary"
-        type="button"
-        :disabled="!inputValue"
-        @click="clearInput"
-      >
-        {{ _('Clear') }}
-      </button>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  data() {
-    return {
-      inputValue: ''
-    }
-  },
-  methods: {
-    clearInput() {
-      this.inputValue = '';
-      this.$emit('change', null);
-    }
-  }
-}
-</script>
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 93934ca0..30e30316 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -2,7 +2,7 @@
   <div class="page-sidebar bg-dark p-2 text-light d-flex flex-column justify-content-between">
     <div>
       <div class="company-name px-3 py-2 my-2">
-        <h6 class="m-0">{{ companyName }}</h6>
+        <h6 class="m-0" @click="$router.push('/')">{{ companyName }}</h6>
       </div>
       <div>
         <transition-group name="slide-fade" mode="out-in">
@@ -95,6 +95,9 @@ export default {
 @import '../styles/variables.scss';
 @import '../styles/animation.scss';
 
+.company-name {
+  cursor: pointer;
+}
 .page-sidebar {
   height: 100vh;
 }
diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue
new file mode 100644
index 00000000..5b4ebd6d
--- /dev/null
+++ b/src/pages/Dashboard.vue
@@ -0,0 +1,119 @@
+<template>
+  <div>
+    <PageHeader title="Dashboard" />
+    <div class="container mt-3">
+      <div class="row no-gutters">
+        <DashboardCard v-for="chart in chartData" :key="chart.title" :chartData="chart" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageHeader from '../components/PageHeader';
+import DashboardCard from '../components/DashboardCard';
+import frappe from 'frappejs';
+
+export default {
+  name: 'Dashboard',
+  components: {
+    PageHeader,
+    DashboardCard
+  },
+  data() {
+    return {
+      chartData: [],
+      charts: undefined
+    };
+  },
+  async beforeMount() {
+    const dashboardSettings = await frappe.getDoc('DashboardSettings');
+    this.charts = dashboardSettings.charts;
+    this.charts.forEach(async c => {
+      const { labels, datasets } = await this.getAccountData(c.account, c.type);
+      this.chartData.push({
+        title: c.account,
+        type: c.type.toLowerCase(),
+        color: c.color,
+        data: {
+          labels,
+          datasets
+        }
+      });
+    });
+  },
+  methods: {
+    async getAccountData(account, chartType) {
+      let entriesArray = [];
+      let accountType;
+      async function getAccountEntries(accountName) {
+        const account = await frappe.getDoc('Account', accountName);
+        accountType = account.rootType;
+        if (account.isGroup != 1) {
+          const ledgerEntries = await frappe.db.getAll({
+            doctype: 'AccountingLedgerEntry',
+            filters: { account: account.name },
+            fields: ['*']
+          });
+          entriesArray = entriesArray.concat(ledgerEntries);
+        } else {
+          const children = await frappe.db.getAll({
+            doctype: 'Account',
+            filters: { parentAccount: account.name }
+          });
+          if (children.length)
+            for (let account of children) {
+              entriesArray = await getAccountEntries(account.name);
+            }
+        }
+        return entriesArray;
+      }
+      let ledgerEntries = await getAccountEntries(account);
+      accountType = ['Asset', 'Expense'].includes(accountType)
+        ? 'debit'
+        : 'credit';
+      let { labels, datasets } = this.createLabelsAndDataSet(chartType);
+      const currentMonthIndex = new Date().getMonth();
+      for (let entry of ledgerEntries) {
+        let monthIndex = parseInt(entry.date.split('-')[1]) - 1;
+        let pos = (monthIndex + currentMonthIndex) % 13;
+        if (accountType === 'debit')
+          datasets[0].values[pos] += entry.debit || -entry.credit;
+        else if (accountType === 'credit')
+          datasets[0].values[pos] += -entry.debit || entry.credit;
+      }
+      return { labels, datasets };
+    },
+    createLabelsAndDataSet(chartType) {
+      const currentMonthIndex = new Date().getMonth();
+      const currentYear = new Date().getFullYear();
+      const monthName = [
+        'Jan',
+        'Feb',
+        'Mar',
+        'Apr',
+        'May',
+        'June',
+        'July',
+        'Aug',
+        'Sept',
+        'Oct',
+        'Nov',
+        'Dec'
+      ];
+      let labels = [];
+      let datasets = [
+        {
+          type: chartType,
+          values: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+        }
+      ];
+      for (let i = 0; i < 13; i++) {
+        let year = i + currentMonthIndex >= 12 ? currentYear : currentYear - 1;
+        labels.push(monthName[(i + currentMonthIndex) % 12]);
+      }
+      return { labels, datasets };
+    }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/src/pages/DataImport/index.vue b/src/pages/DataImport/index.vue
index b68c0ca8..debac2ec 100644
--- a/src/pages/DataImport/index.vue
+++ b/src/pages/DataImport/index.vue
@@ -6,7 +6,7 @@
           :docfield="{
             fieldtype: 'Select',
             fieldname: 'referenceDoctype',
-            options: ['Select a doctype...', 'ToDo', 'Item', 'Party', 'Invoice']
+            options: ['Select a doctype...', 'ToDo', 'Item', 'Party', 'SalesInvoice']
           }"
           @change="doctype => showTable(doctype)"
         />
diff --git a/src/pages/Desk.vue b/src/pages/Desk.vue
index c50c6dac..81726b47 100644
--- a/src/pages/Desk.vue
+++ b/src/pages/Desk.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="row no-gutters">
-    <sidebar class="col-2" />
-    <div class="page-container col-10 bg-light">
+  <div class="row no-gutters d-flex">
+    <sidebar class="sidebar" />
+    <div class="page-container bg-white">
       <router-view :key="$route.fullPath" />
     </div>
   </div>
@@ -18,7 +18,12 @@ export default {
 <style>
 .page-container {
   height: 100vh;
-  overflow: auto;
-  overflow-x: hidden;
+  width: 100%;
+  padding-left: 208px;
+  overflow: hidden;
+}
+.sidebar {
+  position: fixed;
+  /* flex-basis: 220px; */
 }
 </style>
diff --git a/src/pages/FormView/FormView.vue b/src/pages/FormView/FormView.vue
index 25ff39b4..8f11c4d5 100644
--- a/src/pages/FormView/FormView.vue
+++ b/src/pages/FormView/FormView.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="bg-light">
+  <div class="bg-white">
     <page-header :breadcrumbs="breadcrumbs" />
-    <div class="form-container col-10 bg-white mt-4 ml-auto mr-auto border p-5">
+    <div class="form-container col-sm-8 col-lg-6 mx-2 mt-4">
       <form-actions
         v-if="shouldRenderForm"
         :doc="doc"
@@ -56,12 +56,12 @@ export default {
       if (this.doc)
         return [
           {
-            title: this.doctype,
+            title: this.meta.label,
             route: '#/list/' + this.doctype
           },
           {
             title: this.doc._notInserted
-              ? 'New ' + this.doctype
+              ? 'New ' + this.meta.label
               : this.doc.name,
             route: ''
           }
diff --git a/src/pages/ListView/ListRow.vue b/src/pages/ListView/ListRow.vue
index b037a10c..df8c1cb3 100644
--- a/src/pages/ListView/ListRow.vue
+++ b/src/pages/ListView/ListRow.vue
@@ -4,14 +4,14 @@
   </div>
 </template>
 <style lang="scss">
-@import "../../styles/variables";
+@import '../../styles/variables';
 .list-row {
   cursor: pointer;
   border: 1px solid $border-color;
   background-color: var(--white);
 
   &:hover {
-    background-color: var(--light);
+    background-color: var(--white);
   }
 }
 
diff --git a/src/pages/ListView/ListToolbar.vue b/src/pages/ListView/ListToolbar.vue
index be936873..91c8260c 100644
--- a/src/pages/ListView/ListToolbar.vue
+++ b/src/pages/ListView/ListToolbar.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="row">
     <div class="col-6 d-flex">
-      <search-input class="mr-2" @change="keyword => filterList(keyword)"/>
+      <!-- <search-bar class="mr-2" @change="keyword => filterList(keyword)" /> -->
     </div>
     <div class="col-6 d-flex flex-row-reverse">
       <f-button primary @click="$emit('newClick')">{{ _('New {0}', listConfig.title) }}</f-button>
@@ -9,22 +9,18 @@
   </div>
 </template>
 <script>
-import SearchInput from '@/components/SearchInput';
+import SearchBar from '@/components/SearchBar';
 
 export default {
   name: 'ListToolbar',
   props: ['listConfig'],
   components: {
-    SearchInput
+    SearchBar
   },
   methods: {
-    async newInvoice() {
-      const doc = await frappe.getNewDoc('Invoice');
-      this.$formModal.open(doc);
-    },
     filterList(keyword) {
       frappe.listView.trigger('filterList', keyword);
     }
   }
-}
+};
 </script>
diff --git a/src/pages/ListView/index.vue b/src/pages/ListView/index.vue
index bc4d9da3..3caef52a 100644
--- a/src/pages/ListView/index.vue
+++ b/src/pages/ListView/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="bg-light">
+  <div class="bg-white">
     <page-header :title="listConfig.title" />
     <div class="px-4 py-3">
       <list-toolbar
@@ -8,9 +8,7 @@
         @filterList="keyword => filterList(keyword)"
         class="mb-4"
       />
-      <list
-        :listConfig="listConfig"
-      />
+      <list :listConfig="listConfig" />
     </div>
   </div>
 </template>
@@ -51,5 +49,5 @@ export default {
       return listConfigs[this.listName];
     }
   }
-}
+};
 </script>
diff --git a/src/pages/ListView/listConfig.js b/src/pages/ListView/listConfig.js
index 84a6dbb5..80cd53ac 100644
--- a/src/pages/ListView/listConfig.js
+++ b/src/pages/ListView/listConfig.js
@@ -1,5 +1,5 @@
-import Invoice from '../../../models/doctype/Invoice/InvoiceList';
-import Bill from '../../../models/doctype/Bill/BillList';
+import SalesInvoice from '../../../models/doctype/SalesInvoice/SalesInvoiceList';
+import PurchaseInvoice from '../../../models/doctype/PurchaseInvoice/PurchaseInvoiceList';
 import Customer from '../../../models/doctype/Party/CustomerList';
 import Supplier from '../../../models/doctype/Party/SupplierList';
 import Item from '../../../models/doctype/Item/ItemList';
@@ -10,8 +10,8 @@ import Account from '../../../models/doctype/Account/AccountList';
 import GSTR3B from '../../../models/doctype/GSTR3B/GSTR3BList';
 
 export default {
-  Invoice,
-  Bill,
+  SalesInvoice,
+  PurchaseInvoice,
   Customer,
   Supplier,
   Item,
diff --git a/src/pages/PrintView/index.vue b/src/pages/PrintView/index.vue
index b4657448..a5a136d4 100644
--- a/src/pages/PrintView/index.vue
+++ b/src/pages/PrintView/index.vue
@@ -1,17 +1,17 @@
 <template>
-  <div class="bg-light">
+  <div class="bg-white">
     <page-header :breadcrumbs="breadcrumbs" />
     <component :is="printComponent" v-if="doc" :doc="doc" @send="send" @makePDF="makePDF" />
   </div>
 </template>
 <script>
 import PageHeader from '@/components/PageHeader';
-import InvoicePrint from '@/../models/doctype/Invoice/InvoicePrint';
+import SalesInvoicePrint from '@/../models/doctype/SalesInvoice/SalesInvoicePrint';
 import GSTR3BPrintView from '@/../models/doctype/GSTR3B/GSTR3BPrintView';
 import EmailSend from '../Email/EmailSend';
 
 const printComponents = {
-  Invoice: InvoicePrint,
+  SalesInvoice: SalesInvoicePrint,
   GSTR3B: GSTR3BPrintView
 };
 export default {
diff --git a/src/pages/Report/index.vue b/src/pages/Report/index.vue
index 898fe43a..24a9152b 100644
--- a/src/pages/Report/index.vue
+++ b/src/pages/Report/index.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <div class="px-3">
-      <div class="row pb-4">
-        <page-header :class="linksExists ? 'col-6':'col-12'" :breadcrumbs="breadcrumbs" />
-        <report-links class="col-6 d-flex pr-0 flex-row-reverse" v-if="linksExists" :links="links"></report-links>
+      <div class="row pb-4 d-flex">
+        <page-header :breadcrumbs="breadcrumbs" style="flex-grow: 1;" />
+        <report-links class="d-flex flex-row-reverse" v-if="linksExists" :links="links"></report-links>
       </div>
       <div class="row pb-4">
         <report-filters
diff --git a/src/pages/ReportList.vue b/src/pages/ReportList.vue
index 8b04995b..14e9ef81 100644
--- a/src/pages/ReportList.vue
+++ b/src/pages/ReportList.vue
@@ -1,13 +1,13 @@
 <template>
   <div>
-    <page-header title="Reports"/>
+    <page-header title="Reports" />
     <div class="row">
       <div class="col-8 mx-auto">
         <clickable-card
           class="mt-2"
           title="General Ledger"
           description="List of all ledger entries booked against all accounts"
-          @click="routeTo('general-ledger', { 'referenceType': 'Invoice' })"
+          @click="routeTo('general-ledger', { 'referenceType': 'SalesInvoice' })"
         />
         <clickable-card
           class="mt-2"
@@ -27,13 +27,14 @@
           description="Sales transactions for a given period with invoiced amount and tax details"
           @click="routeTo('sales-register')"
         />
-        <clickable-card 
+        <clickable-card
           class="mt-2"
           title="Bank Reconciliation"
           description="Bank Reconciliation statement"
           @click="routeTo('bank-reconciliation',{'toDate' : (new Date()).toISOString()})"
         />
-        <clickable-card  v-if="country === 'India'"
+        <clickable-card
+          v-if="country === 'India'"
           class="mt-2"
           title="Goods and Service Tax"
           description="See your goods and services tax here."
@@ -52,8 +53,8 @@ export default {
   name: 'Report',
   data() {
     return {
-      country: '',
-    }
+      country: ''
+    };
   },
   components: {
     PageHeader,
@@ -62,7 +63,6 @@ export default {
   async created() {
     const doc = await frappe.getDoc('AccountingSettings');
     this.country = doc.country;
-
   },
   methods: {
     routeTo(route, filters) {
diff --git a/src/pages/Settings/Settings.vue b/src/pages/Settings/Settings.vue
index 1b5c66e3..e6673663 100644
--- a/src/pages/Settings/Settings.vue
+++ b/src/pages/Settings/Settings.vue
@@ -1,15 +1,19 @@
 <template>
   <div>
-    <page-header title="Settings"/>
+    <page-header title="Settings" />
     <div class="row">
-      <div class="col-8 bg-white mt-4 mx-auto border p-5">
-        <setting-section doctype="AccountingSettings"/>
-        <hr class="mt-4">
-        <setting-section doctype="CompanySettings"/>
-        <hr class="mt-4">
-        <setting-section doctype="EmailAccount"/>
-        <hr class="mt-4">
-        <setting-section doctype="SystemSettings"/>
+      <div class="col-12 bg-white border p-5">
+        <div class="col-9 col-lg-6 ml-1">
+          <setting-section doctype="AccountingSettings" />
+          <hr class="mt-4" />
+          <setting-section doctype="CompanySettings" />
+          <hr class="mt-4" />
+          <setting-section doctype="EmailAccount" />
+          <hr class="mt-4" />
+          <setting-section doctype="SystemSettings" />
+          <hr class="mt-4" />
+          <setting-section doctype="DashboardSettings" />
+        </div>
       </div>
     </div>
   </div>
diff --git a/src/router/index.js b/src/router/index.js
index 9f6fa1a6..f5007c5b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,6 +2,7 @@ import Vue from 'vue';
 import Router from 'vue-router';
 
 import ListView from '../pages/ListView';
+import Dashboard from '../pages/Dashboard';
 import FormView from '../pages/FormView/FormView';
 import PrintView from '../pages/PrintView';
 
@@ -22,7 +23,7 @@ Vue.use(Router);
 const routes = [
   {
     path: '/',
-    redirect: '/chartOfAccounts'
+    component: Dashboard
   },
   {
     path: '/list/:listName',
diff --git a/src/sidebarConfig.js b/src/sidebarConfig.js
index d3ea6ffa..2bb1afa5 100644
--- a/src/sidebarConfig.js
+++ b/src/sidebarConfig.js
@@ -2,10 +2,28 @@ import frappe from 'frappejs';
 import { _ } from 'frappejs/utils';
 const path = require('path');
 
-export default {
+const config = {
   getTitle: async () => {
-    const accountingSettings = await frappe.getSingle('AccountingSettings');
-    return accountingSettings.companyName;
+    const { companyName, country } = await frappe.getSingle(
+      'AccountingSettings'
+    );
+    if (country === 'India') {
+      config.groups[2].items.push(
+        {
+          label: _('GSTR 1'),
+          route: '/report/gstr-1?transferType=B2B'
+        },
+        {
+          label: _('GSTR 2'),
+          route: '/report/gstr-2?transferType=B2B'
+        },
+        {
+          label: _('GSTR 3B'),
+          route: '/list/GSTR3B'
+        }
+      );
+    }
+    return companyName;
   },
   getDbName() {
     if (localStorage.dbPath) {
@@ -55,12 +73,12 @@ export default {
       title: _('Transactions'),
       items: [
         {
-          label: _('Invoice'),
-          route: '/list/Invoice'
+          label: _('Sales Invoice'),
+          route: '/list/SalesInvoice'
         },
         {
-          label: _('Bill'),
-          route: '/list/Bill'
+          label: _('Purchase Invoice'),
+          route: '/list/PurchaseInvoice'
         },
         {
           label: _('Journal Entry'),
@@ -87,21 +105,13 @@ export default {
           label: _('Sales Register'),
           route: '/report/sales-register'
         },
+        {
+          label: _('Purchase Register'),
+          route: '/report/purchase-register'
+        },
         {
           label: _('Bank Reconciliation'),
           route: '/report/bank-reconciliation'
-        },
-        {
-          label: _('GSTR 1'),
-          route: '/report/gstr-1?transferType=B2B'
-        },
-        {
-          label: _('GSTR 2'),
-          route: '/report/gstr-2?transferType=B2B'
-        },
-        {
-          label: _('GSTR 3B'),
-          route: '/list/GSTR3B'
         }
       ]
     },
@@ -120,3 +130,5 @@ export default {
     }
   ]
 };
+
+export default config;