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

fix: resolved merge conflict

Browse Source
This commit is contained in:
Diptanil Saha
2025-01-07 18:02:45 +05:30
committed by GitHub
parent ea22e32223
commit 0094d78cee
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/accounts/doctype/pos_profile/pos_profile.json
View File

@@ -376,8 +376,6 @@
"fieldname": "disable_rounded_total", "fieldname": "disable_rounded_total",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Disable Rounded Total" "label": "Disable Rounded Total"
<<<<<<< HEAD
=======
}, },
{ {
"fieldname": "utm_campaign", "fieldname": "utm_campaign",
@@ -405,7 +403,6 @@
"fieldname": "print_receipt_on_order_complete", "fieldname": "print_receipt_on_order_complete",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Print Receipt on Order Complete" "label": "Print Receipt on Order Complete"
>>>>>>> 2788739c1e (feat: pos configuration for print receipt on complete order (#45024))
} }
], ],
"icon": "icon-cog", "icon": "icon-cog",
@@ -433,11 +430,7 @@
"link_fieldname": "pos_profile" "link_fieldname": "pos_profile"
} }
], ],
<<<<<<< HEAD
"modified": "2022-08-10 12:57:06.241439",
=======
"modified": "2025-01-01 11:07:03.161950", "modified": "2025-01-01 11:07:03.161950",
>>>>>>> 2788739c1e (feat: pos configuration for print receipt on complete order (#45024))
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "POS Profile", "name": "POS Profile",
@@ -466,4 +459,4 @@
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"states": [] "states": []
} }