nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-16 21:35:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: address field position

Browse Source 
(cherry picked from commit 8ccd7a3e61)

# Conflicts:
#	erpnext/public/scss/erpnext.scss
This commit is contained in:
Smit Vora
2025-04-21 13:44:20 +05:30
committed by Mergify
parent ac3b2ba003
commit 62261a276f
4 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
View File

@@ -143,11 +143,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",
@@ -1548,7 +1548,7 @@
{
"fieldname": "company_shipping_address_section",
"fieldtype": "Section Break",
"label": "Company Shipping Address"
"label": "Shipping Address"
},
{
"fieldname": "column_break_126",

6
erpnext/buying/doctype/purchase_order/purchase_order.json
View File

@@ -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",

13
erpnext/public/scss/erpnext.scss
View File

@@ -590,6 +590,19 @@ body[data-route="pos"] {
justify-content: center;
}
<<<<<<< HEAD
.frappe-control[data-fieldname="other_charges_calculation"] .ql-editor {
=======
.frappe-control[data-fieldname="other_charges_calculation"] .ql-editor,
.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,
.frappe-control[data-fieldname="billing_address_display"] .ql-editor,
.frappe-control[data-fieldname="company_address_display"] .ql-editor {
>>>>>>> 8ccd7a3e61 (refactor: address field position)
white-space: normal;
}

8
erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
View File

@@ -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",