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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2025-03-04 15:47:03 +05:30
parent 3a03865a8f
commit 489efda985
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/tax_withheld_vouchers/tax_withheld_vouchers.json
View File

@@ -34,11 +34,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-01-13 13:40:41.479208",
=======
"modified": "2025-02-05 16:39:14.863698", "modified": "2025-02-05 16:39:14.863698",
>>>>>>> f8ab021920 (fix: change voucher_type and voucher_no field type to data)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Tax Withheld Vouchers", "name": "Tax Withheld Vouchers",