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

fix: do not add gst fields if no indian company

Browse Source 
(cherry picked from commit 43038aab79)

# Conflicts:
#	erpnext/patches.txt
This commit is contained in:
hrwx
2021-11-27 21:46:13 +00:00
committed by mergify-bot
parent 3621ee234e
commit 3b75f09462
2 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/patches.txt
View File

@@ -311,10 +311,15 @@ execute:frappe.reload_doc("erpnext_integrations", "doctype", "Product Tax Catego
erpnext.patches.v13_0.custom_fields_for_taxjar_integration #08-11-2021 erpnext.patches.v13_0.custom_fields_for_taxjar_integration #08-11-2021
erpnext.patches.v13_0.set_operation_time_based_on_operating_cost erpnext.patches.v13_0.set_operation_time_based_on_operating_cost
erpnext.patches.v13_0.validate_options_for_data_field erpnext.patches.v13_0.validate_options_for_data_field
<<<<<<< HEAD
erpnext.patches.v13_0.create_website_items #30-09-2021 erpnext.patches.v13_0.create_website_items #30-09-2021
erpnext.patches.v13_0.populate_e_commerce_settings erpnext.patches.v13_0.populate_e_commerce_settings
erpnext.patches.v13_0.make_homepage_products_website_items erpnext.patches.v13_0.make_homepage_products_website_items
erpnext.patches.v13_0.update_dates_in_tax_withholding_category erpnext.patches.v13_0.update_dates_in_tax_withholding_category
=======
erpnext.patches.v13_0.create_gst_payment_entry_fields #27-11-2021
erpnext.patches.v14_0.delete_shopify_doctypes
>>>>>>> 43038aab79 (fix: do not add gst fields if no indian company)
erpnext.patches.v13_0.fix_invoice_statuses erpnext.patches.v13_0.fix_invoice_statuses
erpnext.patches.v13_0.replace_supplier_item_group_with_party_specific_item erpnext.patches.v13_0.replace_supplier_item_group_with_party_specific_item
erpnext.patches.v13_0.gst_fields_for_pos_invoice erpnext.patches.v13_0.gst_fields_for_pos_invoice

45
erpnext/patches/v13_0/create_gst_payment_entry_fields.py
View File

@@ -9,24 +9,29 @@ def execute():
frappe.reload_doc('accounts', 'doctype', 'advance_taxes_and_charges') frappe.reload_doc('accounts', 'doctype', 'advance_taxes_and_charges')
frappe.reload_doc('accounts', 'doctype', 'payment_entry') frappe.reload_doc('accounts', 'doctype', 'payment_entry')
custom_fields = { if frappe.db.exists('Company', {'country': 'India'}):
'Payment Entry': [ custom_fields = {
dict(fieldname='gst_section', label='GST Details', fieldtype='Section Break', insert_after='deductions', 'Payment Entry': [
print_hide=1, collapsible=1), dict(fieldname='gst_section', label='GST Details', fieldtype='Section Break', insert_after='deductions',
dict(fieldname='company_address', label='Company Address', fieldtype='Link', insert_after='gst_section', print_hide=1, collapsible=1),
print_hide=1, options='Address'), dict(fieldname='company_address', label='Company Address', fieldtype='Link', insert_after='gst_section',
dict(fieldname='company_gstin', label='Company GSTIN', print_hide=1, options='Address'),
fieldtype='Data', insert_after='company_address', dict(fieldname='company_gstin', label='Company GSTIN',
fetch_from='company_address.gstin', print_hide=1, read_only=1), fieldtype='Data', insert_after='company_address',
dict(fieldname='place_of_supply', label='Place of Supply', fetch_from='company_address.gstin', print_hide=1, read_only=1),
fieldtype='Data', insert_after='company_gstin', dict(fieldname='place_of_supply', label='Place of Supply',
print_hide=1, read_only=1), fieldtype='Data', insert_after='company_gstin',
dict(fieldname='customer_address', label='Customer Address', fieldtype='Link', insert_after='place_of_supply', print_hide=1, read_only=1),
print_hide=1, options='Address', depends_on = 'eval:doc.party_type == "Customer"'), dict(fieldname='customer_address', label='Customer Address', fieldtype='Link', insert_after='place_of_supply',
dict(fieldname='customer_gstin', label='Customer GSTIN', print_hide=1, options='Address', depends_on = 'eval:doc.party_type == "Customer"'),
fieldtype='Data', insert_after='customer_address', dict(fieldname='customer_gstin', label='Customer GSTIN',
fetch_from='customer_address.gstin', print_hide=1, read_only=1) fieldtype='Data', insert_after='customer_address',
] fetch_from='customer_address.gstin', print_hide=1, read_only=1)
} ]
}
create_custom_fields(custom_fields, update=True) create_custom_fields(custom_fields, update=True)
else:
fields = ['gst_section', 'company_address', 'company_gstin', 'place_of_supply', 'customer_address', 'customer_gstin']
for field in fields:
frappe.delete_doc_if_exists("Custom Field", f"Payment Entry-{field}")