nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 00:44:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2026-03-10 17:58:37 +05:30
parent f9a38696b6
commit c7da21812a
3 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1693,11 +1693,7 @@
"idx": 204, "idx": 204,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2026-02-23 14:23:57.269770",
=======
"modified": "2026-03-09 17:15:27.014131", "modified": "2026-03-09 17:15:27.014131",
>>>>>>> 9cf529215f (fix: set default list view columns and filters for sales, purchase and accounts module)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice", "name": "Purchase Invoice",

4
erpnext/buying/doctype/supplier/supplier.json
View File

@@ -517,11 +517,7 @@
"link_fieldname": "party" "link_fieldname": "party"
} }
], ],
<<<<<<< HEAD
"modified": "2026-02-10 21:28:01.101808",
=======
"modified": "2026-03-09 17:15:25.465759", "modified": "2026-03-09 17:15:25.465759",
>>>>>>> 9cf529215f (fix: set default list view columns and filters for sales, purchase and accounts module)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Supplier", "name": "Supplier",

4
erpnext/stock/doctype/delivery_note/delivery_note.json
View File

@@ -1452,11 +1452,7 @@
"idx": 146, "idx": 146,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2026-02-10 14:35:08.523130",
=======
"modified": "2026-03-09 17:15:27.932956", "modified": "2026-03-09 17:15:27.932956",
>>>>>>> 9cf529215f (fix: set default list view columns and filters for sales, purchase and accounts module)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Delivery Note", "name": "Delivery Note",