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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2023-11-20 14:15:03 +05:30
parent 9f8aa7c59d
commit 12f027b3f4
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1562,11 +1562,7 @@
"icon": "fa fa-file-text", "icon": "fa fa-file-text",
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2022-09-30 03:49:50.455199",
=======
"modified": "2023-11-20 12:27:12.848149", "modified": "2023-11-20 12:27:12.848149",
>>>>>>> 83a13e22b7 (refactor: add flag to POS Invoice)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "POS Invoice", "name": "POS Invoice",