nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 11:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2025-04-28 11:36:24 +05:30
parent d8c0e7156e
commit feb4038c06
3 changed files with 0 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1629,14 +1629,6 @@
"fieldname": "update_outstanding_for_self", "fieldname": "update_outstanding_for_self",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Update Outstanding for Self" "label": "Update Outstanding for Self"
<<<<<<< HEAD
=======
},
{
"fieldname": "sender",
"fieldtype": "Data",
"label": "Sender",
"options": "Email"
}, },
{ {
"fieldname": "dispatch_address_display", "fieldname": "dispatch_address_display",
@@ -1651,7 +1643,6 @@
"label": "Select Dispatch Address ", "label": "Select Dispatch Address ",
"options": "Address", "options": "Address",
"print_hide": 1 "print_hide": 1
>>>>>>> 54b5205221 (feat: add dispatch address fields to purchase doctypes)
} }
], ],
"grid_page_length": 50, "grid_page_length": 50,

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

@@ -1271,20 +1271,6 @@
"fieldtype": "Tab Break", "fieldtype": "Tab Break",
"label": "Connections", "label": "Connections",
"show_dashboard": 1 "show_dashboard": 1
<<<<<<< HEAD
=======
},
{
"fieldname": "advance_payment_status",
"fieldtype": "Select",
"hidden": 1,
"in_standard_filter": 1,
"label": "Advance Payment Status",
"no_copy": 1,
"oldfieldname": "status",
"oldfieldtype": "Select",
"options": "Not Initiated\nInitiated\nPartially Paid\nFully Paid",
"print_hide": 1
}, },
{ {
"fieldname": "dispatch_address", "fieldname": "dispatch_address",
@@ -1299,7 +1285,6 @@
"label": "Dispatch Address Details", "label": "Dispatch Address Details",
"print_hide": 1, "print_hide": 1,
"read_only": 1 "read_only": 1
>>>>>>> 54b5205221 (feat: add dispatch address fields to purchase doctypes)
} }
], ],
"grid_page_length": 50, "grid_page_length": 50,
@@ -1307,11 +1292,7 @@
"idx": 105, "idx": 105,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2024-03-20 16:03:31.611808",
=======
"modified": "2025-04-09 16:54:08.836106", "modified": "2025-04-09 16:54:08.836106",
>>>>>>> 54b5205221 (feat: add dispatch address fields to purchase doctypes)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Purchase Order", "name": "Purchase Order",

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

@@ -590,19 +590,6 @@ body[data-route="pos"] {
justify-content: center; 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="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; white-space: normal;
} }