CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-03 02:25:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2025-03-04 15:46:05 +05:30
parent df4f4d9a31
commit 1089cdf213
2 changed files with 0 additions and 23 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,
"istable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2023-01-13 13:40:41.479208",
=======
"modified": "2025-02-05 16:39:14.863698",
>>>>>>> f8ab021920 (fix: change voucher_type and voucher_no field type to data)
"modified_by": "Administrator",
"module": "Accounts",
"name": "Tax Withheld Vouchers",

19
erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.py
View File

@@ -6,23 +6,4 @@ from frappe.model.document import Document
class TaxWithheldVouchers(Document):
<<<<<<< HEAD
=======
# begin: auto-generated types
# This code is auto-generated. Do not modify anything in this block.
from typing import TYPE_CHECKING
if TYPE_CHECKING:
from frappe.types import DF
parent: DF.Data
parentfield: DF.Data
parenttype: DF.Data
taxable_amount: DF.Currency
voucher_name: DF.Data | None
voucher_type: DF.Data | None
# end: auto-generated types
>>>>>>> f8ab021920 (fix: change voucher_type and voucher_no field type to data)
pass