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

Merge pull request #28600 from frappe/mergify/bp/version-13-hotfix/pr-28592

Browse Source 
fix: do not add gst fields if no indian company (backport #28592)
This commit is contained in:
Deepesh Garg
2021-12-03 09:37:54 +05:30
committed by GitHub
parent a1fa55f41f fa54cd31a0
commit 313eb70bfa
3 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/patches.txt
View File

@@ -292,7 +292,7 @@ erpnext.patches.v13_0.rename_issue_status_hold_to_on_hold
erpnext.patches.v13_0.bill_for_rejected_quantity_in_purchase_invoice erpnext.patches.v13_0.bill_for_rejected_quantity_in_purchase_invoice
erpnext.patches.v13_0.update_job_card_details erpnext.patches.v13_0.update_job_card_details
erpnext.patches.v13_0.update_level_in_bom #1234sswef erpnext.patches.v13_0.update_level_in_bom #1234sswef
erpnext.patches.v13_0.create_gst_payment_entry_fields erpnext.patches.v13_0.create_gst_payment_entry_fields #27-11-2021
erpnext.patches.v13_0.add_missing_fg_item_for_stock_entry erpnext.patches.v13_0.add_missing_fg_item_for_stock_entry
erpnext.patches.v13_0.update_subscription_status_in_memberships erpnext.patches.v13_0.update_subscription_status_in_memberships
erpnext.patches.v13_0.update_amt_in_work_order_required_items erpnext.patches.v13_0.update_amt_in_work_order_required_items

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}")

0
erpnext/www/shop-by-category/__init__.py
View File