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

chore: Resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-11-15 13:57:44 +05:30
committed by GitHub
parent 07badbc0f2
commit ca96c24c8d
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

@@ -2109,11 +2109,7 @@
"link_fieldname": "consolidated_invoice" "link_fieldname": "consolidated_invoice"
} }
], ],
<<<<<<< HEAD
"modified": "2022-10-11 13:07:36.488095",
=======
"modified": "2022-11-15 09:33:47.870616", "modified": "2022-11-15 09:33:47.870616",
>>>>>>> 9f5d613c78 (fix: Write Off section visibility for non POS Invoices)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",
@@ -2169,4 +2165,4 @@
"title_field": "title", "title_field": "title",
"track_changes": 1, "track_changes": 1,
"track_seen": 1 "track_seen": 1
} }