From 8ccd7a3e61e72a711d9cbdaa5e89dddaa6a42e05 Mon Sep 17 00:00:00 2001 From: Smit Vora Date: Mon, 21 Apr 2025 13:44:20 +0530 Subject: [PATCH] refactor: address field position --- .../doctype/purchase_invoice/purchase_invoice.json | 8 ++++---- erpnext/buying/doctype/purchase_order/purchase_order.json | 6 +++--- erpnext/public/scss/erpnext.scss | 1 + .../stock/doctype/purchase_receipt/purchase_receipt.json | 8 ++++---- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json index 2a1f83e829f..5b91c709e13 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -144,11 +144,11 @@ "contact_mobile", "contact_email", "company_shipping_address_section", - "shipping_address", - "shipping_address_display", - "column_break_126", "dispatch_address", "dispatch_address_display", + "column_break_126", + "shipping_address", + "shipping_address_display", "company_billing_address_section", "billing_address", "column_break_130", @@ -1550,7 +1550,7 @@ { "fieldname": "company_shipping_address_section", "fieldtype": "Section Break", - "label": "Company Shipping Address" + "label": "Shipping Address" }, { "fieldname": "column_break_126", diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index 1cd47b28ceb..c72fee664e5 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -109,11 +109,11 @@ "contact_mobile", "contact_email", "shipping_address_section", - "shipping_address", - "shipping_address_display", - "column_break_99", "dispatch_address", "dispatch_address_display", + "column_break_99", + "shipping_address", + "shipping_address_display", "company_billing_address_section", "billing_address", "column_break_103", diff --git a/erpnext/public/scss/erpnext.scss b/erpnext/public/scss/erpnext.scss index ed77f362c34..b0b589fa962 100644 --- a/erpnext/public/scss/erpnext.scss +++ b/erpnext/public/scss/erpnext.scss @@ -610,6 +610,7 @@ body[data-route="pos"] { .frappe-control[data-fieldname="address_display"] .ql-editor, .frappe-control[data-fieldname="shipping_address_display"] .ql-editor, .frappe-control[data-fieldname="shipping_address"] .ql-editor, +.frappe-control[data-fieldname="dispatch_address_display"] .ql-editor, .frappe-control[data-fieldname="dispatch_address"] .ql-editor, .frappe-control[data-fieldname="source_address_display"] .ql-editor, .frappe-control[data-fieldname="target_address_display"] .ql-editor, diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json index 8ae9ef58d3d..de4087c8610 100755 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -112,11 +112,11 @@ "contact_mobile", "contact_email", "section_break_98", - "shipping_address", - "shipping_address_display", - "column_break_100", "dispatch_address", "dispatch_address_display", + "column_break_100", + "shipping_address", + "shipping_address_display", "billing_address_section", "billing_address", "column_break_104", @@ -1200,7 +1200,7 @@ { "fieldname": "section_break_98", "fieldtype": "Section Break", - "label": "Company Shipping Address" + "label": "Shipping Address" }, { "fieldname": "billing_address_section",