diff --git a/accounting/gst.js b/accounting/gst.js
index 660b08fc..05dc389e 100644
--- a/accounting/gst.js
+++ b/accounting/gst.js
@@ -70,11 +70,11 @@ export async function generateGstr1Json(report, { transferType, toDate }) {
     const gstData = {
       version: 'GST3.0.4',
       hash: 'hash',
+      gstin: printSettings.gstin,
       // fp is the the MMYYYY for the last month of the report
       // for example if you are extracting report for 1st July 2020 to 31st September 2020 then
       // fb = 092020
       fp: DateTime.fromISO(toDate).toFormat('MMyyyy'),
-      gstin: printSettings.gstin,
     };
 
     // based condition we need to triggered different methods
@@ -107,9 +107,10 @@ async function getB2bData(invoices) {
       idt: DateTime.fromFormat(row.invDate, 'yyyy-MM-dd').toFormat(
         'dd-MM-yyyy'
       ),
-      value: row.invAmt,
+      val: row.invAmt,
       pos: row.gstin && row.gstin.substring(0, 2),
       rchrg: row.reverseCharge,
+      inv_typ: 'R',
       itms: [],
     };
 
diff --git a/models/doctype/Item/Item.js b/models/doctype/Item/Item.js
index 2b54120d..b6e04e29 100644
--- a/models/doctype/Item/Item.js
+++ b/models/doctype/Item/Item.js
@@ -115,7 +115,7 @@ export default {
     {
       fieldname: 'itemCode',
       label: 'Item Code',
-      fieldtype: 'Data',
+      fieldtype: 'Int',
       placeholder: 'Item Code',
     },
   ],
diff --git a/models/doctype/PurchaseInvoiceItem/PurchaseInvoiceItem.js b/models/doctype/PurchaseInvoiceItem/PurchaseInvoiceItem.js
index 7449126a..401eccba 100644
--- a/models/doctype/PurchaseInvoiceItem/PurchaseInvoiceItem.js
+++ b/models/doctype/PurchaseInvoiceItem/PurchaseInvoiceItem.js
@@ -89,7 +89,7 @@ export default {
     {
       fieldname: 'itemCode',
       label: 'Item Code',
-      fieldtype: 'Data',
+      fieldtype: 'Int',
       formula: (row, doc) => doc.getFrom('Item', row.item, 'itemCode'),
       formulaDependsOn: ['item'],
     },
diff --git a/models/doctype/SalesInvoiceItem/SalesInvoiceItem.js b/models/doctype/SalesInvoiceItem/SalesInvoiceItem.js
index 54ee7952..ccf73ce8 100644
--- a/models/doctype/SalesInvoiceItem/SalesInvoiceItem.js
+++ b/models/doctype/SalesInvoiceItem/SalesInvoiceItem.js
@@ -90,7 +90,7 @@ export default {
     {
       fieldname: 'itemCode',
       label: 'Item Code',
-      fieldtype: 'Data',
+      fieldtype: 'Int',
       formula: (row, doc) => doc.getFrom('Item', row.item, 'itemCode'),
       formulaDependsOn: ['item'],
     },
diff --git a/src/messages.js b/src/messages.js
index 2fcc1ce9..3e77abd4 100644
--- a/src/messages.js
+++ b/src/messages.js
@@ -16,6 +16,7 @@ export const IPC_ACTIONS = {
   GET_DIALOG_RESPONSE: 'show-message-box',
   GET_PRIMARY_DISPLAY_SIZE: 'get-primary-display-size',
   SAVE_HTML_AS_PDF: 'save-html-as-pdf',
+  SAVE_REPORT_AS_JSON: 'save-report-as-json',
   SHOW_ERROR: 'show-error',
 };
 
@@ -23,5 +24,4 @@ export const DB_CONN_FAILURE = {
   INVALID_FILE: 'invalid-file',
   CANT_OPEN: 'cant-open',
   CANT_CONNECT: 'cant-connect',
-  SAVE_REPORT_AS_JSON: 'save-report-as-json',
 };