Resolved merge conflicts

accounting/gst.js

@@ -5,6 +5,7 @@ import { DateTime } from 'luxon';
 import { saveExportData } from '../reports/commonExporter';
 import { getSavePath } from '../src/utils';
 
+// prettier-ignore
 export const stateCodeMap = {
   'JAMMU AND KASHMIR': '1',
   'HIMACHAL PRADESH': '2',
@@ -184,7 +185,7 @@ async function generateB2clData(invoices) {
   for (let invoice of invoices) {
     const stateInvoiceRecord = {
       pos: stateCodeMap[invoice.place.toUpperCase()],
-      inv: []
+      inv: [],
     };
 
     const invRecord = {
@@ -194,7 +195,7 @@ async function generateB2clData(invoices) {
       ),
       val: invoice.invAmt,
       itms: [],
-    }
+    };
 
     let items = await frappe.db
       .knex('SalesInvoiceItem')
@@ -231,22 +232,20 @@ async function generateB2csData(invoices) {
   const b2cs = [];
 
   for (let invoice of invoices) {
-
     const pos = invoice.place.toUpperCase();
 
     const invRecord = {
-      "sply_ty": invoice.inState ? "INTRA" : "INTER",
+      sply_ty: invoice.inState ? 'INTRA' : 'INTER',
-      "pos": stateCodeMap[pos],
+      pos: stateCodeMap[pos],
       // "OE" - Abbreviation for errors and omissions excepted.
-      // https://specialties.bayt.com/en/specialties/q/53093/what-is-meant-by-e-amp-oe-on-bill-or-invoice-or-any-document/#:~:text=E%26OE%20on,not%20purposely%20written
+      typ: 'OE',
-      "typ": "OE",
+      txval: invoice.taxVal,
-      "txval": invoice.taxVal,
+      rt: invoice.rate,
-      "rt": invoice.rate,
+      iamt: !invoice.inState ? (invoice.taxVal * invoice.rate) / 100 : 0,
-      "iamt": !invoice.inState ? (invoice.taxVal * invoice.rate / 100) : 0,
+      camt: invoice.inState ? invoice.cgstAmt : 0,
-      "camt": invoice.inState ? invoice.cgstAmt : 0,
+      samt: invoice.inState ? invoice.sgstAmt : 0,
-      "samt": invoice.inState ? invoice.sgstAmt : 0,
+      csamt: 0,
-      "csamt": 0
+    };
-    }
 
     b2cs.push(invRecord);
   }

models/doctype/Address/Address.js

@@ -1,3 +1,16 @@
+import { stateCodeMap } from '../../../accounting/gst';
+import countryList from '../../../fixtures/countryInfo.json';
+import { titleCase } from '../../../src/utils';
+
+function getStates(doc) {
+  switch (doc.country) {
+    case 'India':
+      return Object.keys(stateCodeMap).map(titleCase).sort();
+    default:
+      return [];
+  }
+}
+
 export default {
   name: 'Address',
   doctype: 'DocType',
@@ -9,7 +22,7 @@ export default {
     'city',
     'state',
     'country',
-    'postalCode'
+    'postalCode',
   ],
   fields: [
     {
@@ -23,69 +36,71 @@ export default {
       fieldname: 'addressLine2',
       label: 'Address Line 2',
       placeholder: 'Address Line 2',
-      fieldtype: 'Data'
+      fieldtype: 'Data',
     },
     {
       fieldname: 'city',
       label: 'City / Town',
       placeholder: 'City / Town',
       fieldtype: 'Data',
-      required: 1
+      required: 1,
     },
     {
       fieldname: 'state',
       label: 'State',
       placeholder: 'State',
-      fieldtype: 'Data',
+      fieldtype: 'AutoComplete',
+      getList: getStates,
     },
     {
       fieldname: 'country',
       label: 'Country',
       placeholder: 'Country',
-      fieldtype: 'Data',
+      fieldtype: 'AutoComplete',
-      required: 1
+      getList: () => Object.keys(countryList).sort(),
+      required: 1,
     },
     {
       fieldname: 'postalCode',
       label: 'Postal Code',
       placeholder: 'Postal Code',
-      fieldtype: 'Data'
+      fieldtype: 'Data',
     },
     {
       fieldname: 'emailAddress',
       label: 'Email Address',
       placeholder: 'Email Address',
-      fieldtype: 'Data'
+      fieldtype: 'Data',
     },
     {
       fieldname: 'phone',
       label: 'Phone',
       placeholder: 'Phone',
-      fieldtype: 'Data'
+      fieldtype: 'Data',
     },
     {
       fieldname: 'fax',
       label: 'Fax',
-      fieldtype: 'Data'
+      fieldtype: 'Data',
     },
     {
       fieldname: 'addressDisplay',
       fieldtype: 'Text',
       label: 'Address Display',
       readOnly: true,
-      formula: doc => {
+      formula: (doc) => {
         return [
           doc.addressLine1,
           doc.addressLine2,
           doc.city,
           doc.state,
           doc.country,
-          doc.postalCode
+          doc.postalCode,
         ]
           .filter(Boolean)
           .join(', ');
-      }
+      },
-    }
+    },
   ],
   quickEditFields: [
     'addressLine1',
@@ -93,7 +108,7 @@ export default {
     'city',
     'state',
     'country',
-    'postalCode'
+    'postalCode',
   ],
-  inlineEditDisplayField: 'addressDisplay'
+  inlineEditDisplayField: 'addressDisplay',
 };

models/doctype/Address/RegionalChanges.js

@@ -1,6 +1,7 @@
-import { cloneDeep, capitalize } from 'lodash';
+import { cloneDeep } from 'lodash';
-import AddressOriginal from './Address';
 import { stateCodeMap } from '../../../accounting/gst';
+import { titleCase } from '../../../src/utils';
+import AddressOriginal from './Address';
 
 export default function getAugmentedAddress({ country }) {
   const Address = cloneDeep(AddressOriginal);
@@ -8,22 +9,21 @@ export default function getAugmentedAddress({ country }) {
     return Address;
   }
 
+  const stateList = Object.keys(stateCodeMap).map(titleCase).sort();
   if (country === 'India') {
     Address.fields = [
       ...Address.fields,
       {
         fieldname: 'pos',
         label: 'Place of Supply',
-        fieldtype: 'Select',
+        fieldtype: 'AutoComplete',
         placeholder: 'Place of Supply',
-        options: Object.keys(stateCodeMap).map((key) => capitalize(key)),
+        formula: (doc) => (stateList.includes(doc.state) ? doc.state : ''),
+        getList: () => stateList,
       },
     ];
 
-    Address.quickEditFields = [
+    Address.quickEditFields = [...Address.quickEditFields, 'pos'];
-      ...Address.quickEditFields,
-      'pos',
-    ];
   }
 
   return Address;

package.json

@@ -26,12 +26,11 @@
     "csvjson-csv2json": "^5.0.6",
     "electron-store": "^8.0.1",
     "frappe-charts": "1.6.1",
-    "frappejs": "https://github.com/frappe/frappejs",
+    "frappejs": "frappe/frappejs",
     "knex": "^0.95.12",
     "lodash": "^4.17.21",
     "luxon": "^2.0.2",
-    "portal-vue": "^2.1.7",
+    "sqlite3": "npm:@vscode/sqlite3@^5.0.7",
-    "sqlite3": "^5.0.2",
     "vue": "^2.6.14",
     "vue-router": "^3.5.3"
   },

reports/GoodsAndServiceTax/BaseGSTR.js

@@ -1,23 +1,27 @@
 import frappe from 'frappejs';
-import { stateCodeMap } from '../../accounting/gst'
+import { stateCodeMap } from '../../accounting/gst';
 
 class BaseGSTR {
   async getCompleteReport(gstrType, filters) {
     if (['GSTR-1', 'GSTR-2'].includes(gstrType)) {
+      const place = filters.place;
+      delete filters.place;
       let entries = await frappe.db.getAll({
         doctype: gstrType === 'GSTR-1' ? 'SalesInvoice' : 'PurchaseInvoice',
-        filters
+        filters,
       });
+      filters.place = place;
 
       let tableData = [];
       for (let entry of entries) {
-        entry.doctype = gstrType === 'GSTR-1' ? 'SalesInvoice' : 'PurchaseInvoice';
+        entry.doctype =
+          gstrType === 'GSTR-1' ? 'SalesInvoice' : 'PurchaseInvoice';
         const row = await this.getRow(entry);
         tableData.push(row);
       }
 
       if (Object.keys(filters).length != 0) {
-        tableData = tableData.filter(row => {
+        tableData = tableData.filter((row) => {
           if (filters.account) return row.account === filters.account;
           if (filters.transferType)
             return row.transferType === filters.transferType;
@@ -25,6 +29,7 @@ class BaseGSTR {
           return true;
         });
       }
+
       return tableData;
     } else {
       return [];
@@ -32,37 +37,55 @@ class BaseGSTR {
   }
 
   async getRow(ledgerEntry) {
-    let row = {};
     ledgerEntry = await frappe.getDoc(ledgerEntry.doctype, ledgerEntry.name);
+
+    const row = {};
     const { gstin } = frappe.AccountingSettings;
+
     let party = await frappe.getDoc(
       'Party',
       ledgerEntry.customer || ledgerEntry.supplier
     );
+
     if (party.address) {
       let addressDetails = await frappe.getDoc('Address', party.address);
       row.place = addressDetails.pos || '';
     }
+
     row.gstin = party.gstin;
     row.partyName = ledgerEntry.customer || ledgerEntry.supplier;
     row.invNo = ledgerEntry.name;
     row.invDate = ledgerEntry.date;
     row.rate = 0;
-    row.inState = gstin && gstin.substring(0, 2) === stateCodeMap[row.place.toUpperCase()];
+    row.inState =
+      gstin && gstin.substring(0, 2) === stateCodeMap[row.place?.toUpperCase()];
     row.reverseCharge = !party.gstin ? 'Y' : 'N';
-    ledgerEntry.taxes?.forEach(tax => {
+
+    ledgerEntry.taxes?.forEach((tax) => {
       row.rate += tax.rate;
       const taxAmt = (tax.rate * ledgerEntry.netTotal) / 100;
-      if (tax.account === 'IGST') row.igstAmt = taxAmt;
+
-      if (tax.account === 'IGST') row.inState = false;
+      switch (tax.account) {
-      if (tax.account === 'CGST') row.cgstAmt = taxAmt;
+        case 'IGST': {
-      if (tax.account === 'SGST') row.sgstAmt = taxAmt;
+          row.igstAmt = taxAmt;
-      if (tax.account === 'Nil Rated') row.nilRated = true;
+          row.inState = false;
-      if (tax.account === 'Exempt') row.exempt = true;
+        }
-      if (tax.account === 'Non GST') row.nonGST = true;
+        case 'CGST':
+          row.cgstAmt = taxAmt;
+        case 'SGST':
+          row.sgstAmt = taxAmt;
+        case 'Nil Rated':
+          row.nilRated = true;
+        case 'Exempt':
+          row.exempt = true;
+        case 'Non GST':
+          row.nonGST = true;
+      }
     });
+
     row.invAmt = ledgerEntry.grandTotal;
     row.taxVal = ledgerEntry.netTotal;
+
     return row;
   }
 }

reports/GoodsAndServiceTax/BaseViewConfig.js

@@ -1,4 +1,6 @@
 import { DateTime } from 'luxon';
+import { stateCodeMap } from '../../accounting/gst';
+import { titleCase } from '../../src/utils';
 
 const transferTypeMap = {
   B2B: 'B2B',
@@ -6,6 +8,7 @@ const transferTypeMap = {
   B2CS: 'B2C-Small',
   NR: 'Nil Rated, Exempted and Non GST supplies',
 };
+const stateList = Object.keys(stateCodeMap).map(titleCase).sort();
 
 export default {
   filterFields: [
@@ -20,11 +23,12 @@ export default {
       size: 'small',
     },
     {
-      fieldtype: 'Data',
+      fieldtype: 'AutoComplete',
       label: 'Place',
       size: 'small',
       placeholder: 'Place',
       fieldname: 'place',
+      getList: () => stateList,
     },
     {
       fieldtype: 'Date',

reports/GoodsAndServiceTax/GSTR1.js

@@ -8,6 +8,8 @@ class GSTR1 extends BaseGSTR {
     filters.cancelled = 0;
     if (params.toDate || params.fromDate) {
       filters.date = [];
+
+      if (params.place) filters.place = params.place;
       if (params.toDate) filters.date.push('<=', params.toDate);
       if (params.fromDate) filters.date.push('>=', params.fromDate);
     }

src/App.vue

@@ -18,7 +18,6 @@
       @setup-complete="showSetupWizardOrDesk(true)"
       @setup-canceled="setupCanceled"
     />
-    <portal-target name="popovers" multiple></portal-target>
     <div id="toast-container" class="absolute bottom-0 right-0 mr-6 mb-3">
       <div id="toast-target" />
     </div>

src/components/Controls/AutoComplete.vue

@@ -59,6 +59,9 @@ export default {
       },
     },
   },
+  inject: {
+    doc: { default: null },
+  },
   computed: {},
   methods: {
     async updateSuggestions(e) {
@@ -81,7 +84,7 @@ export default {
       keyword = keyword.toLowerCase();
 
       let list = this.df.getList
-        ? await this.df.getList()
+        ? await this.df.getList(this.doc)
         : this.df.options || [];
 
       let items = list.map((d) => {
@@ -118,6 +121,12 @@ export default {
     async onBlur(value) {
       if (value === '' || value == null) {
         this.triggerChange('');
+        return;
+      }
+
+      if (value && this.suggestions.length === 0) {
+        this.triggerChange(value);
+        return;
       }
 
       if (

src/components/Controls/Select.vue

@@ -5,7 +5,6 @@
     </div>
     <div
       class="
-        relative
         flex
         items-center
         justify-between
@@ -38,7 +37,7 @@
       </select>
       <svg
         class="w-3 h-3"
-        style="background: inherit; z-index: 1; transform: translateX(3px)"
+        style="background: inherit; margin-right: -3px"
         viewBox="0 0 5 10"
         xmlns="http://www.w3.org/2000/svg"
       >

src/components/Popover.vue

@@ -3,17 +3,15 @@
     <div class="h-full">
       <slot name="target" :togglePopover="togglePopover"></slot>
     </div>
-    <portal to="popovers">
+    <div
-      <div
+      ref="popover"
-        ref="popover"
+      :class="popoverClass"
-        :class="popoverClass"
+      class="bg-white rounded border shadow-md popover-container relative"
-        class="bg-white rounded border shadow-md popover-container relative"
+      v-show="isOpen"
-        v-show="isOpen"
+    >
-      >
+      <div v-if="!hideArrow" class="popover-arrow" ref="popover-arrow"></div>
-        <div v-if="!hideArrow" class="popover-arrow" ref="popover-arrow"></div>
+      <slot name="content" :togglePopover="togglePopover"></slot>
-        <slot name="content" :togglePopover="togglePopover"></slot>
+    </div>
-      </div>
-    </portal>
   </div>
 </template>
 
@@ -25,17 +23,17 @@ export default {
   props: {
     hideArrow: {
       type: Boolean,
-      default: false
+      default: false,
     },
     showPopup: {
-      default: null
+      default: null,
     },
     right: Boolean,
     placement: {
       type: String,
-      default: 'bottom-start'
+      default: 'bottom-start',
     },
-    popoverClass: [String, Object, Array]
+    popoverClass: [String, Object, Array],
   },
   watch: {
     showPopup(value) {
@@ -45,18 +43,18 @@ export default {
       if (value === false) {
         this.close();
       }
-    }
+    },
   },
   data() {
     return {
-      isOpen: false
+      isOpen: false,
     };
   },
   mounted() {
-    let listener = e => {
+    let listener = (e) => {
       let $els = [this.$refs.reference, this.$refs.popover];
       let insideClick = $els.some(
-        $el => $el && (e.target === $el || $el.contains(e.target))
+        ($el) => $el && (e.target === $el || $el.contains(e.target))
       );
       if (insideClick) {
         return;
@@ -83,17 +81,17 @@ export default {
                 {
                   name: 'arrow',
                   options: {
-                    element: this.$refs['popover-arrow']
+                    element: this.$refs['popover-arrow'],
-                  }
+                  },
                 },
                 {
                   name: 'offset',
                   options: {
-                    offset: [0, 10]
+                    offset: [0, 10],
-                  }
+                  },
-                }
+                },
               ]
-            : []
+            : [],
         });
       } else {
         this.popper.update();
@@ -126,8 +124,8 @@ export default {
       }
       this.isOpen = false;
       this.$emit('close');
-    }
+    },
-  }
+  },
 };
 </script>
 <style scoped>

src/main.js

@@ -2,7 +2,6 @@ import { ipcRenderer } from 'electron';
 import frappe from 'frappejs';
 import FeatherIcon from 'frappejs/ui/components/FeatherIcon';
 import outsideClickDirective from 'frappejs/ui/plugins/outsideClickDirective';
-import PortalVue from 'portal-vue';
 import Vue from 'vue';
 import models from '../models';
 import App from './App';
@@ -36,7 +35,6 @@ import router from './router';
   Vue.config.productionTip = false;
   Vue.component('feather-icon', FeatherIcon);
   Vue.directive('on-outside-click', outsideClickDirective);
-  Vue.use(PortalVue);
   Vue.mixin({
     computed: {
       frappe() {

src/utils.js

@@ -4,6 +4,7 @@ import router from '@/router';
 import { ipcRenderer } from 'electron';
 import frappe from 'frappejs';
 import { _ } from 'frappejs/utils';
+import lodash from 'lodash';
 import Vue from 'vue';
 import { IPC_ACTIONS, IPC_MESSAGES } from './messages';
 
@@ -337,3 +338,16 @@ export function showToast(props) {
     },
   });
 }
+
+export function titleCase(phrase) {
+  return phrase
+    .split(' ')
+    .map((word) => {
+      const wordLower = word.toLowerCase();
+      if (['and', 'an', 'a', 'from', 'by', 'on'].includes(wordLower)) {
+        return wordLower;
+      }
+      return lodash.capitalize(wordLower);
+    })
+    .join(' ');
+}