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

fix: change voucher_type and voucher_no field type to data

Browse Source 
(cherry picked from commit f8ab021920)

# Conflicts:
#	erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json
This commit is contained in:
Sugesh393
2025-02-05 18:40:21 +05:30
committed by Mergify
parent ef44ad79a0
commit 3a03865a8f
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json
View File

@@ -13,17 +13,15 @@
"fields": [ "fields": [
{ {
"fieldname": "voucher_type", "fieldname": "voucher_type",
"fieldtype": "Link", "fieldtype": "Data",
"in_list_view": 1, "in_list_view": 1,
"label": "Voucher Type", "label": "Voucher Type"
"options": "DocType"
}, },
{ {
"fieldname": "voucher_name", "fieldname": "voucher_name",
"fieldtype": "Dynamic Link", "fieldtype": "Data",
"in_list_view": 1, "in_list_view": 1,
"label": "Voucher Name", "label": "Voucher Name"
"options": "voucher_type"
}, },
{ {
"fieldname": "taxable_amount", "fieldname": "taxable_amount",
@@ -36,7 +34,11 @@
"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": "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", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Tax Withheld Vouchers", "name": "Tax Withheld Vouchers",

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

@@ -18,8 +18,8 @@ class TaxWithheldVouchers(Document):
parentfield: DF.Data parentfield: DF.Data
parenttype: DF.Data parenttype: DF.Data
taxable_amount: DF.Currency taxable_amount: DF.Currency
voucher_name: DF.DynamicLink | None voucher_name: DF.Data | None
voucher_type: DF.Link | None voucher_type: DF.Data | None
# end: auto-generated types # end: auto-generated types
pass pass