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

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2024-07-24 13:01:51 +05:30
parent e607f3c78d
commit 2ae94b2af2
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/journal_entry/journal_entry.json
View File

@@ -557,11 +557,7 @@
"table_fieldname": "payment_entries" "table_fieldname": "payment_entries"
} }
], ],
<<<<<<< HEAD
"modified": "2023-11-23 12:11:04.128015",
=======
"modified": "2024-07-18 15:32:29.413598", "modified": "2024-07-18 15:32:29.413598",
>>>>>>> e81373bb6a (chore: remove 'repost_required' from Journal Entry)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Journal Entry", "name": "Journal Entry",
@@ -612,4 +608,4 @@
"states": [], "states": [],
"title_field": "title", "title_field": "title",
"track_changes": 1 "track_changes": 1
} }

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

@@ -2178,11 +2178,7 @@
"link_fieldname": "consolidated_invoice" "link_fieldname": "consolidated_invoice"
} }
], ],
<<<<<<< HEAD
"modified": "2024-06-07 16:49:32.458402",
=======
"modified": "2024-07-18 15:30:39.428519", "modified": "2024-07-18 15:30:39.428519",
>>>>>>> 06c5334f2a (chore: remove stale 'repost_required' flag from sales invoice)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",