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

chore: resolve conflicts

Browse Source
This commit is contained in:
Gursheen Kaur Anand
2024-03-20 20:03:03 +05:30
committed by GitHub
parent 501b09a170
commit 8e5d481cba
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/buying/doctype/purchase_order/purchase_order.json
View File

@@ -1275,11 +1275,7 @@
"idx": 105, "idx": 105,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-10-01 20:58:07.851037",
=======
"modified": "2024-03-20 16:03:31.611808", "modified": "2024-03-20 16:03:31.611808",
>>>>>>> 1c63983873 (fix: use Text Editor for rendering tax breakup table)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Purchase Order", "name": "Purchase Order",
@@ -1334,4 +1330,4 @@
"timeline_field": "supplier", "timeline_field": "supplier",
"title_field": "supplier_name", "title_field": "supplier_name",
"track_changes": 1 "track_changes": 1
} }