commit 8728e94dbd3d9d328e52bbad228aa09aa828dc75
author Rohan <Alchez@users.noreply.github.com> Tue Oct 29 11:26:00 2019 +0530
committer GitHub <noreply@github.com> Tue Oct 29 11:26:00 2019 +0530
tree 046330ba027aac3f9281872afed653fec1a437ab
parent 962f4eb96cf3da2bfa96a7c39590749cee5075fd
parent 9942fcc8cb8d2d45ebd285b4876e2f69c725f897

Merge branch 'develop' into develop-company-address-label

erpnext/selling/doctype/sales_order/sales_order.json

diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index ccc48e1..0a19fad 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -31,8 +31,8 @@
   "contact_phone",
   "contact_mobile",
   "contact_email",
-  "company_address_display",
   "company_address",
+  "company_address_display",
   "col_break46",
   "shipping_address_name",
   "shipping_address",
@@ -342,12 +342,13 @@
   {
    "fieldname": "company_address_display",
    "fieldtype": "Small Text",
+   "label": "Company Address",
    "read_only": 1
   },
   {
    "fieldname": "company_address",
    "fieldtype": "Link",
-   "label": "Company Address",
+   "label": "Company Address Name",
    "options": "Address"
   },
   {
@@ -1193,7 +1194,7 @@
  "icon": "fa fa-file-text",
  "idx": 105,
  "is_submittable": 1,
- "modified": "2019-10-22 14:26:42.767189",
+ "modified": "2019-10-23 14:26:42.767189",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Sales Order",