From 828fc9d3444325dc2d9d6983c74dab2eb2c363d8 Mon Sep 17 00:00:00 2001
From: Saqib <nextchamp.saqib@gmail.com>
Date: Wed, 8 Sep 2021 16:04:13 +0530
Subject: [PATCH] fix: scan barcode fields input length (#27389)

* fix: undo unintentional changes

* fix: scan barcode fields input length

(cherry picked from commit df3e4ce1c09675f941f7622333b555eee16e0981)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
---
 erpnext/accounts/doctype/sales_invoice/sales_invoice.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index c0b1c596007..bae174a6848 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -2047,7 +2047,11 @@
    "link_fieldname": "consolidated_invoice"
   }
  ],
+<<<<<<< HEAD
  "modified": "2023-01-28 19:45:47.538163",
+=======
+ "modified": "2021-09-08 15:24:25.486499",
+>>>>>>> df3e4ce1c0 (fix: scan barcode fields input length (#27389))
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice",