From 0c9d901842498f4a14d8b643151855b67fc56add Mon Sep 17 00:00:00 2001 From: Kitti U Date: Thu, 18 Jan 2024 16:07:00 +0700 Subject: [PATCH] FIX: Deduct WHT not work with JE --- thai_tax/custom/custom_api.py | 6 +- thai_tax/fixtures/custom_field.json | 440 ++++++++++++++-------------- 2 files changed, 225 insertions(+), 221 deletions(-) diff --git a/thai_tax/custom/custom_api.py b/thai_tax/custom/custom_api.py index ad78b21..74018b1 100644 --- a/thai_tax/custom/custom_api.py +++ b/thai_tax/custom/custom_api.py @@ -465,7 +465,11 @@ def get_withholding_tax(filters, doc): wht = frappe.get_doc("Withholding Tax Type", filters["wht_type"]) company = frappe.get_doc("Company", pay["company"]) for ref in pay.get("references"): - if ref.get("reference_doctype") not in ["Purchase Invoice", "Expense Claim"]: + if ref.get("reference_doctype") not in [ + "Purchase Invoice", + "Expense Claim", + "Journal Entry" + ]: return if not ref.get("allocated_amount") or not ref.get("total_amount"): continue diff --git a/thai_tax/fixtures/custom_field.json b/thai_tax/fixtures/custom_field.json index 7dd6e7b..39a7a03 100644 --- a/thai_tax/fixtures/custom_field.json +++ b/thai_tax/fixtures/custom_field.json @@ -57,19 +57,19 @@ "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, - "collapsible": 1, + "collapsible": 0, "collapsible_depends_on": null, "columns": 0, "default": null, - "depends_on": "eval:doc.account_type == 'Tax'", + "depends_on": "", "description": null, "docstatus": 0, "doctype": "Custom Field", - "dt": "Journal Entry Account", + "dt": "Expense Claim", "fetch_from": null, "fetch_if_empty": 0, - "fieldname": "overwrite_tax_invoice", - "fieldtype": "Section Break", + "fieldname": "tax_invoice", + "fieldtype": "Tab Break", "hidden": 0, "hide_border": 0, "hide_days": 0, @@ -80,15 +80,15 @@ "in_list_view": 0, "in_preview": 0, "in_standard_filter": 0, - "insert_after": "credit", + "insert_after": "advances", "is_system_generated": 0, "is_virtual": 0, - "label": "Overwrite Tax Invoice", + "label": "Tax Invoice", "length": 0, "mandatory_depends_on": null, - "modified": "2023-07-30 14:26:00.658430", + "modified": "2023-03-04 13:09:25.108020", "module": null, - "name": "Journal Entry Account-overwrite_tax_invoice", + "name": "Expense Claim-tax_invoice", "no_copy": 0, "non_negative": 0, "options": null, @@ -109,7 +109,7 @@ }, { "allow_in_quick_entry": 0, - "allow_on_submit": 0, + "allow_on_submit": 1, "bold": 0, "collapsible": 0, "collapsible_depends_on": null, @@ -119,11 +119,11 @@ "description": null, "docstatus": 0, "doctype": "Custom Field", - "dt": "Journal Entry Account", + "dt": "Expense Claim", "fetch_from": null, "fetch_if_empty": 0, - "fieldname": "tax_invoice_number", - "fieldtype": "Data", + "fieldname": "company_tax_address", + "fieldtype": "Link", "hidden": 0, "hide_border": 0, "hide_days": 0, @@ -134,18 +134,18 @@ "in_list_view": 0, "in_preview": 0, "in_standard_filter": 0, - "insert_after": "overwrite_tax_invoice", + "insert_after": "tax_invoice", "is_system_generated": 0, "is_virtual": 0, - "label": "Tax Invoice Number", + "label": "Company Tax Address", "length": 0, - "mandatory_depends_on": null, - "modified": "2023-07-30 14:29:09.239782", + "mandatory_depends_on": "", + "modified": "2023-03-04 13:09:25.405902", "module": null, - "name": "Journal Entry Account-tax_invoice_number", + "name": "Expense Claim-company_tax_address", "no_copy": 0, "non_negative": 0, - "options": null, + "options": "Address", "permlevel": 0, "precision": "", "print_hide": 0, @@ -173,11 +173,11 @@ "description": null, "docstatus": 0, "doctype": "Custom Field", - "dt": "Journal Entry Account", + "dt": "Expense Claim", "fetch_from": null, "fetch_if_empty": 0, - "fieldname": "tax_invoice_date", - "fieldtype": "Date", + "fieldname": "column_break_rqacr", + "fieldtype": "Column Break", "hidden": 0, "hide_border": 0, "hide_days": 0, @@ -188,15 +188,15 @@ "in_list_view": 0, "in_preview": 0, "in_standard_filter": 0, - "insert_after": "tax_invoice_number", + "insert_after": "company_tax_address", "is_system_generated": 0, "is_virtual": 0, - "label": "Tax Invoice Date", + "label": null, "length": 0, "mandatory_depends_on": null, - "modified": "2023-07-30 14:29:09.316511", + "modified": "2023-03-27 15:49:56.966693", "module": null, - "name": "Journal Entry Account-tax_invoice_date", + "name": "Expense Claim-column_break_rqacr", "no_copy": 0, "non_negative": 0, "options": null, @@ -224,14 +224,14 @@ "columns": 0, "default": null, "depends_on": null, - "description": null, + "description": "Use this field only when you want to overwrite", "docstatus": 0, "doctype": "Custom Field", - "dt": "Journal Entry Account", + "dt": "Expense Claim", "fetch_from": null, "fetch_if_empty": 0, - "fieldname": "column_break_cun7x", - "fieldtype": "Column Break", + "fieldname": "base_amount_overwrite", + "fieldtype": "Currency", "hidden": 0, "hide_border": 0, "hide_days": 0, @@ -242,18 +242,18 @@ "in_list_view": 0, "in_preview": 0, "in_standard_filter": 0, - "insert_after": "tax_invoice_date", + "insert_after": "column_break_rqacr", "is_system_generated": 0, "is_virtual": 0, - "label": null, + "label": "Base Amount Overwrite", "length": 0, "mandatory_depends_on": null, - "modified": "2023-07-30 14:29:09.396593", + "modified": "2023-03-27 15:54:08.388376", "module": null, - "name": "Journal Entry Account-column_break_cun7x", - "no_copy": 0, + "name": "Expense Claim-base_amount_overwrite", + "no_copy": 1, "non_negative": 0, - "options": null, + "options": "Company:company:default_currency", "permlevel": 0, "precision": "", "print_hide": 0, @@ -276,16 +276,16 @@ "collapsible": 0, "collapsible_depends_on": null, "columns": 0, - "default": "00000", + "default": null, "depends_on": null, "description": null, "docstatus": 0, "doctype": "Custom Field", - "dt": "Supplier", + "dt": "Expense Claim", "fetch_from": null, "fetch_if_empty": 0, - "fieldname": "branch_code", - "fieldtype": "Data", + "fieldname": "section_break_uodhb", + "fieldtype": "Section Break", "hidden": 0, "hide_border": 0, "hide_days": 0, @@ -296,15 +296,15 @@ "in_list_view": 0, "in_preview": 0, "in_standard_filter": 0, - "insert_after": "tax_id", + "insert_after": "base_amount_overwrite", "is_system_generated": 0, "is_virtual": 0, - "label": "Branch Code", + "label": null, "length": 0, "mandatory_depends_on": null, - "modified": "2023-03-04 14:39:42.726447", + "modified": "2023-03-04 13:09:25.626290", "module": null, - "name": "Supplier-branch_code", + "name": "Expense Claim-section_break_uodhb", "no_copy": 0, "non_negative": 0, "options": null, @@ -325,7 +325,7 @@ }, { "allow_in_quick_entry": 0, - "allow_on_submit": 0, + "allow_on_submit": 1, "bold": 0, "collapsible": 0, "collapsible_depends_on": null, @@ -335,11 +335,11 @@ "description": null, "docstatus": 0, "doctype": "Custom Field", - "dt": "Journal Entry Account", + "dt": "Expense Claim", "fetch_from": null, "fetch_if_empty": 0, - "fieldname": "supplier", - "fieldtype": "Link", + "fieldname": "tax_invoice_number", + "fieldtype": "Data", "hidden": 0, "hide_border": 0, "hide_days": 0, @@ -349,26 +349,26 @@ "in_global_search": 0, "in_list_view": 0, "in_preview": 0, - "in_standard_filter": 0, - "insert_after": "column_break_cun7x", + "in_standard_filter": 1, + "insert_after": "section_break_uodhb", "is_system_generated": 0, "is_virtual": 0, - "label": "Supplier", + "label": "Tax Invoice Number", "length": 0, - "mandatory_depends_on": null, - "modified": "2023-07-30 14:29:09.467889", + "mandatory_depends_on": "", + "modified": "2023-03-04 13:10:02.762509", "module": null, - "name": "Journal Entry Account-supplier", - "no_copy": 0, + "name": "Expense Claim-tax_invoice_number", + "no_copy": 1, "non_negative": 0, - "options": "Supplier", + "options": null, "permlevel": 0, "precision": "", "print_hide": 0, "print_hide_if_no_value": 0, "print_width": null, "read_only": 0, - "read_only_depends_on": null, + "read_only_depends_on": "eval:doc.docstatus!=0", "report_hide": 0, "reqd": 0, "search_index": 0, @@ -379,7 +379,7 @@ }, { "allow_in_quick_entry": 0, - "allow_on_submit": 0, + "allow_on_submit": 1, "bold": 0, "collapsible": 0, "collapsible_depends_on": null, @@ -389,10 +389,10 @@ "description": null, "docstatus": 0, "doctype": "Custom Field", - "dt": "Journal Entry Account", + "dt": "Expense Claim", "fetch_from": null, "fetch_if_empty": 0, - "fieldname": "customer", + "fieldname": "supplier", "fieldtype": "Link", "hidden": 0, "hide_border": 0, @@ -404,18 +404,18 @@ "in_list_view": 0, "in_preview": 0, "in_standard_filter": 0, - "insert_after": "supplier", + "insert_after": "tax_invoice_number", "is_system_generated": 0, "is_virtual": 0, - "label": "Customer", + "label": "Supplier", "length": 0, - "mandatory_depends_on": null, - "modified": "2023-07-30 14:58:34.278422", + "mandatory_depends_on": "", + "modified": "2023-03-04 13:10:43.691098", "module": null, - "name": "Journal Entry Account-customer", - "no_copy": 0, + "name": "Expense Claim-supplier", + "no_copy": 1, "non_negative": 0, - "options": "Customer", + "options": "Supplier", "permlevel": 0, "precision": "", "print_hide": 0, @@ -435,19 +435,19 @@ "allow_in_quick_entry": 0, "allow_on_submit": 0, "bold": 0, - "collapsible": 0, + "collapsible": 1, "collapsible_depends_on": null, "columns": 0, "default": null, - "depends_on": "", - "description": "Leave this value to 0 and system will auto calculate based on tax rate.", + "depends_on": "eval:doc.account_type == 'Tax'", + "description": null, "docstatus": 0, "doctype": "Custom Field", "dt": "Journal Entry Account", "fetch_from": null, "fetch_if_empty": 0, - "fieldname": "tax_base_amount", - "fieldtype": "Float", + "fieldname": "overwrite_tax_invoice", + "fieldtype": "Section Break", "hidden": 0, "hide_border": 0, "hide_days": 0, @@ -458,15 +458,15 @@ "in_list_view": 0, "in_preview": 0, "in_standard_filter": 0, - "insert_after": "customer", + "insert_after": "credit", "is_system_generated": 0, "is_virtual": 0, - "label": "Tax Base Amount", + "label": "Overwrite Tax Invoice", "length": 0, - "mandatory_depends_on": "", - "modified": "2023-07-30 10:03:38.406442", + "mandatory_depends_on": null, + "modified": "2023-07-30 14:26:00.658430", "module": null, - "name": "Journal Entry Account-tax_base_amount", + "name": "Journal Entry Account-overwrite_tax_invoice", "no_copy": 0, "non_negative": 0, "options": null, @@ -493,15 +493,15 @@ "collapsible_depends_on": null, "columns": 0, "default": null, - "depends_on": "", + "depends_on": null, "description": null, "docstatus": 0, "doctype": "Custom Field", "dt": "Expense Claim", "fetch_from": null, "fetch_if_empty": 0, - "fieldname": "tax_invoice", - "fieldtype": "Tab Break", + "fieldname": "column_break_6atpw", + "fieldtype": "Column Break", "hidden": 0, "hide_border": 0, "hide_days": 0, @@ -512,15 +512,15 @@ "in_list_view": 0, "in_preview": 0, "in_standard_filter": 0, - "insert_after": "advances", + "insert_after": "supplier", "is_system_generated": 0, "is_virtual": 0, - "label": "Tax Invoice", + "label": null, "length": 0, "mandatory_depends_on": null, - "modified": "2023-03-04 13:09:25.108020", + "modified": "2023-03-04 13:10:43.905153", "module": null, - "name": "Expense Claim-tax_invoice", + "name": "Expense Claim-column_break_6atpw", "no_copy": 0, "non_negative": 0, "options": null, @@ -541,7 +541,7 @@ }, { "allow_in_quick_entry": 0, - "allow_on_submit": 1, + "allow_on_submit": 0, "bold": 0, "collapsible": 0, "collapsible_depends_on": null, @@ -551,11 +551,11 @@ "description": null, "docstatus": 0, "doctype": "Custom Field", - "dt": "Expense Claim", + "dt": "Journal Entry Account", "fetch_from": null, "fetch_if_empty": 0, - "fieldname": "company_tax_address", - "fieldtype": "Link", + "fieldname": "tax_invoice_number", + "fieldtype": "Data", "hidden": 0, "hide_border": 0, "hide_days": 0, @@ -566,18 +566,18 @@ "in_list_view": 0, "in_preview": 0, "in_standard_filter": 0, - "insert_after": "tax_invoice", + "insert_after": "overwrite_tax_invoice", "is_system_generated": 0, "is_virtual": 0, - "label": "Company Tax Address", + "label": "Tax Invoice Number", "length": 0, - "mandatory_depends_on": "", - "modified": "2023-03-04 13:09:25.405902", + "mandatory_depends_on": null, + "modified": "2023-07-30 14:29:09.239782", "module": null, - "name": "Expense Claim-company_tax_address", + "name": "Journal Entry Account-tax_invoice_number", "no_copy": 0, "non_negative": 0, - "options": "Address", + "options": null, "permlevel": 0, "precision": "", "print_hide": 0, @@ -595,7 +595,7 @@ }, { "allow_in_quick_entry": 0, - "allow_on_submit": 0, + "allow_on_submit": 1, "bold": 0, "collapsible": 0, "collapsible_depends_on": null, @@ -608,8 +608,8 @@ "dt": "Expense Claim", "fetch_from": null, "fetch_if_empty": 0, - "fieldname": "column_break_rqacr", - "fieldtype": "Column Break", + "fieldname": "tax_invoice_date", + "fieldtype": "Date", "hidden": 0, "hide_border": 0, "hide_days": 0, @@ -620,16 +620,16 @@ "in_list_view": 0, "in_preview": 0, "in_standard_filter": 0, - "insert_after": "company_tax_address", + "insert_after": "column_break_6atpw", "is_system_generated": 0, "is_virtual": 0, - "label": null, + "label": "Tax Invoice Date", "length": 0, - "mandatory_depends_on": null, - "modified": "2023-03-27 15:49:56.966693", + "mandatory_depends_on": "", + "modified": "2023-03-04 13:13:40.021285", "module": null, - "name": "Expense Claim-column_break_rqacr", - "no_copy": 0, + "name": "Expense Claim-tax_invoice_date", + "no_copy": 1, "non_negative": 0, "options": null, "permlevel": 0, @@ -638,7 +638,7 @@ "print_hide_if_no_value": 0, "print_width": null, "read_only": 0, - "read_only_depends_on": null, + "read_only_depends_on": "eval:doc.docstatus!=0", "report_hide": 0, "reqd": 0, "search_index": 0, @@ -654,16 +654,16 @@ "collapsible": 0, "collapsible_depends_on": null, "columns": 0, - "default": "00000", + "default": null, "depends_on": null, "description": null, "docstatus": 0, "doctype": "Custom Field", - "dt": "Customer", + "dt": "Journal Entry Account", "fetch_from": null, "fetch_if_empty": 0, - "fieldname": "branch_code", - "fieldtype": "Data", + "fieldname": "tax_invoice_date", + "fieldtype": "Date", "hidden": 0, "hide_border": 0, "hide_days": 0, @@ -674,15 +674,15 @@ "in_list_view": 0, "in_preview": 0, "in_standard_filter": 0, - "insert_after": "tax_id", + "insert_after": "tax_invoice_number", "is_system_generated": 0, "is_virtual": 0, - "label": "Branch Code", + "label": "Tax Invoice Date", "length": 0, "mandatory_depends_on": null, - "modified": "2023-03-04 14:27:59.612577", + "modified": "2023-07-30 14:29:09.316511", "module": null, - "name": "Customer-branch_code", + "name": "Journal Entry Account-tax_invoice_date", "no_copy": 0, "non_negative": 0, "options": null, @@ -703,21 +703,21 @@ }, { "allow_in_quick_entry": 0, - "allow_on_submit": 0, + "allow_on_submit": 1, "bold": 0, "collapsible": 0, "collapsible_depends_on": null, "columns": 0, "default": null, "depends_on": null, - "description": "Use this field only when you want to overwrite", + "description": null, "docstatus": 0, "doctype": "Custom Field", "dt": "Expense Claim", - "fetch_from": null, + "fetch_from": "supplier.supplier_name", "fetch_if_empty": 0, - "fieldname": "base_amount_overwrite", - "fieldtype": "Currency", + "fieldname": "supplier_name", + "fieldtype": "Data", "hidden": 0, "hide_border": 0, "hide_days": 0, @@ -728,18 +728,18 @@ "in_list_view": 0, "in_preview": 0, "in_standard_filter": 0, - "insert_after": "column_break_rqacr", + "insert_after": "tax_invoice_date", "is_system_generated": 0, "is_virtual": 0, - "label": "Base Amount Overwrite", + "label": "Supplier Name", "length": 0, "mandatory_depends_on": null, - "modified": "2023-03-27 15:54:08.388376", + "modified": "2023-03-04 13:12:34.986425", "module": null, - "name": "Expense Claim-base_amount_overwrite", + "name": "Expense Claim-supplier_name", "no_copy": 1, "non_negative": 0, - "options": "Company:company:default_currency", + "options": null, "permlevel": 0, "precision": "", "print_hide": 0, @@ -751,7 +751,7 @@ "reqd": 0, "search_index": 0, "sort_options": 0, - "translatable": 0, + "translatable": 1, "unique": 0, "width": null }, @@ -767,11 +767,11 @@ "description": null, "docstatus": 0, "doctype": "Custom Field", - "dt": "Expense Claim", + "dt": "Journal Entry Account", "fetch_from": null, "fetch_if_empty": 0, - "fieldname": "section_break_uodhb", - "fieldtype": "Section Break", + "fieldname": "column_break_cun7x", + "fieldtype": "Column Break", "hidden": 0, "hide_border": 0, "hide_days": 0, @@ -782,15 +782,15 @@ "in_list_view": 0, "in_preview": 0, "in_standard_filter": 0, - "insert_after": "base_amount_overwrite", + "insert_after": "tax_invoice_date", "is_system_generated": 0, "is_virtual": 0, "label": null, "length": 0, "mandatory_depends_on": null, - "modified": "2023-03-04 13:09:25.626290", + "modified": "2023-07-30 14:29:09.396593", "module": null, - "name": "Expense Claim-section_break_uodhb", + "name": "Journal Entry Account-column_break_cun7x", "no_copy": 0, "non_negative": 0, "options": null, @@ -811,20 +811,20 @@ }, { "allow_in_quick_entry": 0, - "allow_on_submit": 1, + "allow_on_submit": 0, "bold": 0, "collapsible": 0, "collapsible_depends_on": null, "columns": 0, - "default": null, + "default": "00000", "depends_on": null, "description": null, "docstatus": 0, "doctype": "Custom Field", - "dt": "Expense Claim", + "dt": "Supplier", "fetch_from": null, "fetch_if_empty": 0, - "fieldname": "tax_invoice_number", + "fieldname": "branch_code", "fieldtype": "Data", "hidden": 0, "hide_border": 0, @@ -835,17 +835,17 @@ "in_global_search": 0, "in_list_view": 0, "in_preview": 0, - "in_standard_filter": 1, - "insert_after": "section_break_uodhb", + "in_standard_filter": 0, + "insert_after": "tax_id", "is_system_generated": 0, "is_virtual": 0, - "label": "Tax Invoice Number", + "label": "Branch Code", "length": 0, - "mandatory_depends_on": "", - "modified": "2023-03-04 13:10:02.762509", + "mandatory_depends_on": null, + "modified": "2023-03-04 14:39:42.726447", "module": null, - "name": "Expense Claim-tax_invoice_number", - "no_copy": 1, + "name": "Supplier-branch_code", + "no_copy": 0, "non_negative": 0, "options": null, "permlevel": 0, @@ -854,7 +854,7 @@ "print_hide_if_no_value": 0, "print_width": null, "read_only": 0, - "read_only_depends_on": "eval:doc.docstatus!=0", + "read_only_depends_on": null, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -871,15 +871,15 @@ "collapsible_depends_on": null, "columns": 0, "default": null, - "depends_on": "eval:doc.docstatus==0", + "depends_on": null, "description": null, "docstatus": 0, "doctype": "Custom Field", - "dt": "Payment Entry", + "dt": "Journal Entry Account", "fetch_from": null, "fetch_if_empty": 0, - "fieldname": "deduct_withholding_tax", - "fieldtype": "Button", + "fieldname": "supplier", + "fieldtype": "Link", "hidden": 0, "hide_border": 0, "hide_days": 0, @@ -890,18 +890,18 @@ "in_list_view": 0, "in_preview": 0, "in_standard_filter": 0, - "insert_after": "set_exchange_gain_loss", + "insert_after": "column_break_cun7x", "is_system_generated": 0, "is_virtual": 0, - "label": "Deduct Withholding Tax", + "label": "Supplier", "length": 0, "mandatory_depends_on": null, - "modified": "2023-03-04 12:36:57.731438", + "modified": "2023-07-30 14:29:09.467889", "module": null, - "name": "Payment Entry-deduct_withholding_tax", + "name": "Journal Entry Account-supplier", "no_copy": 0, "non_negative": 0, - "options": null, + "options": "Supplier", "permlevel": 0, "precision": "", "print_hide": 0, @@ -919,7 +919,7 @@ }, { "allow_in_quick_entry": 0, - "allow_on_submit": 1, + "allow_on_submit": 0, "bold": 0, "collapsible": 0, "collapsible_depends_on": null, @@ -929,10 +929,10 @@ "description": null, "docstatus": 0, "doctype": "Custom Field", - "dt": "Expense Claim", + "dt": "Journal Entry Account", "fetch_from": null, "fetch_if_empty": 0, - "fieldname": "supplier", + "fieldname": "customer", "fieldtype": "Link", "hidden": 0, "hide_border": 0, @@ -944,18 +944,18 @@ "in_list_view": 0, "in_preview": 0, "in_standard_filter": 0, - "insert_after": "tax_invoice_number", + "insert_after": "supplier", "is_system_generated": 0, "is_virtual": 0, - "label": "Supplier", + "label": "Customer", "length": 0, - "mandatory_depends_on": "", - "modified": "2023-03-04 13:10:43.691098", + "mandatory_depends_on": null, + "modified": "2023-07-30 14:58:34.278422", "module": null, - "name": "Expense Claim-supplier", - "no_copy": 1, + "name": "Journal Entry Account-customer", + "no_copy": 0, "non_negative": 0, - "options": "Supplier", + "options": "Customer", "permlevel": 0, "precision": "", "print_hide": 0, @@ -979,15 +979,15 @@ "collapsible_depends_on": null, "columns": 0, "default": null, - "depends_on": null, - "description": null, + "depends_on": "", + "description": "Leave this value to 0 and system will auto calculate based on tax rate.", "docstatus": 0, "doctype": "Custom Field", - "dt": "Expense Claim", + "dt": "Journal Entry Account", "fetch_from": null, "fetch_if_empty": 0, - "fieldname": "column_break_6atpw", - "fieldtype": "Column Break", + "fieldname": "tax_base_amount", + "fieldtype": "Float", "hidden": 0, "hide_border": 0, "hide_days": 0, @@ -998,15 +998,15 @@ "in_list_view": 0, "in_preview": 0, "in_standard_filter": 0, - "insert_after": "supplier", + "insert_after": "customer", "is_system_generated": 0, "is_virtual": 0, - "label": null, + "label": "Tax Base Amount", "length": 0, - "mandatory_depends_on": null, - "modified": "2023-03-04 13:10:43.905153", + "mandatory_depends_on": "", + "modified": "2023-07-30 10:03:38.406442", "module": null, - "name": "Expense Claim-column_break_6atpw", + "name": "Journal Entry Account-tax_base_amount", "no_copy": 0, "non_negative": 0, "options": null, @@ -1027,21 +1027,21 @@ }, { "allow_in_quick_entry": 0, - "allow_on_submit": 1, + "allow_on_submit": 0, "bold": 0, "collapsible": 0, "collapsible_depends_on": null, "columns": 0, - "default": null, + "default": "00000", "depends_on": null, "description": null, "docstatus": 0, "doctype": "Custom Field", - "dt": "Expense Claim", + "dt": "Customer", "fetch_from": null, "fetch_if_empty": 0, - "fieldname": "tax_invoice_date", - "fieldtype": "Date", + "fieldname": "branch_code", + "fieldtype": "Data", "hidden": 0, "hide_border": 0, "hide_days": 0, @@ -1052,16 +1052,16 @@ "in_list_view": 0, "in_preview": 0, "in_standard_filter": 0, - "insert_after": "column_break_6atpw", + "insert_after": "tax_id", "is_system_generated": 0, "is_virtual": 0, - "label": "Tax Invoice Date", + "label": "Branch Code", "length": 0, - "mandatory_depends_on": "", - "modified": "2023-03-04 13:13:40.021285", + "mandatory_depends_on": null, + "modified": "2023-03-04 14:27:59.612577", "module": null, - "name": "Expense Claim-tax_invoice_date", - "no_copy": 1, + "name": "Customer-branch_code", + "no_copy": 0, "non_negative": 0, "options": null, "permlevel": 0, @@ -1070,7 +1070,7 @@ "print_hide_if_no_value": 0, "print_width": null, "read_only": 0, - "read_only_depends_on": "eval:doc.docstatus!=0", + "read_only_depends_on": null, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -1081,21 +1081,21 @@ }, { "allow_in_quick_entry": 0, - "allow_on_submit": 1, + "allow_on_submit": 0, "bold": 0, "collapsible": 0, "collapsible_depends_on": null, "columns": 0, "default": null, - "depends_on": null, + "depends_on": "eval:doc.docstatus==0 && doc.references.length > 0", "description": null, "docstatus": 0, "doctype": "Custom Field", - "dt": "Expense Claim", - "fetch_from": "supplier.supplier_name", + "dt": "Payment Entry", + "fetch_from": null, "fetch_if_empty": 0, - "fieldname": "supplier_name", - "fieldtype": "Data", + "fieldname": "deduct_withholding_tax", + "fieldtype": "Button", "hidden": 0, "hide_border": 0, "hide_days": 0, @@ -1106,16 +1106,16 @@ "in_list_view": 0, "in_preview": 0, "in_standard_filter": 0, - "insert_after": "tax_invoice_date", + "insert_after": "set_exchange_gain_loss", "is_system_generated": 0, "is_virtual": 0, - "label": "Supplier Name", + "label": "Deduct Withholding Tax", "length": 0, "mandatory_depends_on": null, - "modified": "2023-03-04 13:12:34.986425", + "modified": "2023-03-04 12:36:57.731438", "module": null, - "name": "Expense Claim-supplier_name", - "no_copy": 1, + "name": "Payment Entry-deduct_withholding_tax", + "no_copy": 0, "non_negative": 0, "options": null, "permlevel": 0, @@ -1129,7 +1129,7 @@ "reqd": 0, "search_index": 0, "sort_options": 0, - "translatable": 1, + "translatable": 0, "unique": 0, "width": null }, @@ -1945,21 +1945,21 @@ }, { "allow_in_quick_entry": 0, - "allow_on_submit": 1, + "allow_on_submit": 0, "bold": 0, "collapsible": 0, "collapsible_depends_on": null, "columns": 0, "default": null, - "depends_on": "eval:doc.party_type=='Employee'", + "depends_on": null, "description": null, "docstatus": 0, "doctype": "Custom Field", - "dt": "Payment Entry", - "fetch_from": "supplier.supplier_name", + "dt": "Sales Invoice", + "fetch_from": null, "fetch_if_empty": 0, - "fieldname": "supplier_name", - "fieldtype": "Data", + "fieldname": "tax_invoice", + "fieldtype": "Tab Break", "hidden": 0, "hide_border": 0, "hide_days": 0, @@ -1970,18 +1970,18 @@ "in_list_view": 0, "in_preview": 0, "in_standard_filter": 0, - "insert_after": "tax_invoice_date", + "insert_after": "total_billing_amount", "is_system_generated": 0, "is_virtual": 0, - "label": "Supplier Name", + "label": "Tax Invoice", "length": 0, "mandatory_depends_on": null, - "modified": "2023-04-30 15:46:05.824582", + "modified": "2023-03-04 12:30:55.408440", "module": null, - "name": "Payment Entry-supplier_name", - "no_copy": 1, + "name": "Sales Invoice-tax_invoice", + "no_copy": 0, "non_negative": 0, - "options": "", + "options": null, "permlevel": 0, "precision": "", "print_hide": 0, @@ -1993,27 +1993,27 @@ "reqd": 0, "search_index": 0, "sort_options": 0, - "translatable": 1, + "translatable": 0, "unique": 0, "width": null }, { "allow_in_quick_entry": 0, - "allow_on_submit": 0, + "allow_on_submit": 1, "bold": 0, "collapsible": 0, "collapsible_depends_on": null, "columns": 0, "default": null, - "depends_on": null, + "depends_on": "eval:doc.party_type=='Employee'", "description": null, "docstatus": 0, "doctype": "Custom Field", - "dt": "Sales Invoice", - "fetch_from": null, + "dt": "Payment Entry", + "fetch_from": "supplier.supplier_name", "fetch_if_empty": 0, - "fieldname": "tax_invoice", - "fieldtype": "Tab Break", + "fieldname": "supplier_name", + "fieldtype": "Data", "hidden": 0, "hide_border": 0, "hide_days": 0, @@ -2024,18 +2024,18 @@ "in_list_view": 0, "in_preview": 0, "in_standard_filter": 0, - "insert_after": "total_billing_amount", + "insert_after": "tax_invoice_date", "is_system_generated": 0, "is_virtual": 0, - "label": "Tax Invoice", + "label": "Supplier Name", "length": 0, "mandatory_depends_on": null, - "modified": "2023-03-04 12:30:55.408440", + "modified": "2023-04-30 15:46:05.824582", "module": null, - "name": "Sales Invoice-tax_invoice", - "no_copy": 0, + "name": "Payment Entry-supplier_name", + "no_copy": 1, "non_negative": 0, - "options": null, + "options": "", "permlevel": 0, "precision": "", "print_hide": 0, @@ -2047,7 +2047,7 @@ "reqd": 0, "search_index": 0, "sort_options": 0, - "translatable": 0, + "translatable": 1, "unique": 0, "width": null },