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

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2024-04-17 11:47:52 +05:30
committed by GitHub
parent 5f41036f4a
commit 6c10783823
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2187,11 +2187,7 @@
"link_fieldname": "consolidated_invoice" "link_fieldname": "consolidated_invoice"
} }
], ],
<<<<<<< HEAD
"modified": "2024-03-22 17:50:34.395602",
=======
"modified": "2024-04-11 11:30:26.272441", "modified": "2024-04-11 11:30:26.272441",
>>>>>>> c3845ac0f1 (fix: Allow updating cost center and project for repostable doctypes)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",
@@ -2246,4 +2242,4 @@
"title_field": "title", "title_field": "title",
"track_changes": 1, "track_changes": 1,
"track_seen": 1 "track_seen": 1
} }