fix: Add child table for tax withheld vouchers

(cherry picked from commit 246c1a9380)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
This commit is contained in:
Deepesh Garg
2022-09-13 20:05:20 +05:30
committed by Mergify
parent d251ef9ce5
commit 4165fee6a7
4 changed files with 91 additions and 0 deletions

View File

@@ -93,6 +93,8 @@
"taxes_and_charges_added",
"taxes_and_charges_deducted",
"total_taxes_and_charges",
"tax_withheld_vouchers_section",
"tax_withheld_vouchers",
"section_break_44",
"apply_discount_on",
"base_discount_amount",
@@ -1366,7 +1368,11 @@
"width": "50px"
},
{
<<<<<<< HEAD
"depends_on": "eval:doc.update_stock && doc.is_subcontracted==\"Yes\"",
=======
"depends_on": "eval:doc.is_subcontracted",
>>>>>>> 246c1a9380 (fix: Add child table for tax withheld vouchers)
"fieldname": "supplier_warehouse",
"fieldtype": "Link",
"label": "Supplier Warehouse",
@@ -1417,13 +1423,40 @@
"label": "Advance Tax",
"options": "Advance Tax",
"read_only": 1
<<<<<<< HEAD
=======
},
{
"default": "0",
"fieldname": "is_old_subcontracting_flow",
"fieldtype": "Check",
"hidden": 1,
"label": "Is Old Subcontracting Flow",
"read_only": 1
},
{
"fieldname": "tax_withheld_vouchers_section",
"fieldtype": "Section Break",
"label": "Tax Withheld Vouchers"
},
{
"fieldname": "tax_withheld_vouchers",
"fieldtype": "Table",
"label": "Tax Withheld Vouchers",
"options": "Tax Withheld Vouchers",
"read_only": 1
>>>>>>> 246c1a9380 (fix: Add child table for tax withheld vouchers)
}
],
"icon": "fa fa-file-text",
"idx": 204,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2021-11-25 13:31:02.716727",
=======
"modified": "2022-09-13 16:22:04.103982",
>>>>>>> 246c1a9380 (fix: Add child table for tax withheld vouchers)
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice",
@@ -1483,6 +1516,7 @@
"show_name_in_global_search": 1,
"sort_field": "modified",
"sort_order": "DESC",
"states": [],
"timeline_field": "supplier",
"title_field": "title",
"track_changes": 1

View File

@@ -0,0 +1,48 @@
{
"actions": [],
"autoname": "autoincrement",
"creation": "2022-09-13 16:18:59.404842",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"voucher_type",
"voucher_name",
"taxable_amount"
],
"fields": [
{
"fieldname": "voucher_type",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Voucher Type",
"options": "DocType"
},
{
"fieldname": "voucher_name",
"fieldtype": "Dynamic Link",
"in_list_view": 1,
"label": "Voucher Name",
"options": "voucher_type"
},
{
"fieldname": "taxable_amount",
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Taxable Amount"
}
],
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2022-09-13 17:31:52.321034",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Tax Withheld Vouchers",
"naming_rule": "Autoincrement",
"owner": "Administrator",
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC",
"states": []
}

View File

@@ -0,0 +1,9 @@
# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
# import frappe
from frappe.model.document import Document
class TaxWithheldVouchers(Document):
pass