mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-15 11:09:17 +00:00
fix: Setup and patch
This commit is contained in:
@@ -9,6 +9,9 @@ def execute():
|
|||||||
if not company:
|
if not company:
|
||||||
return
|
return
|
||||||
|
|
||||||
|
frappe.reload_doc("regional", "doctype", "gst_settings")
|
||||||
|
frappe.reload_doc("accounts", "doctype", "gst_account")
|
||||||
|
|
||||||
journal_entry_types = frappe.get_meta("Journal Entry").get_options("voucher_type").split("\n") + ['Reversal Of ITC']
|
journal_entry_types = frappe.get_meta("Journal Entry").get_options("voucher_type").split("\n") + ['Reversal Of ITC']
|
||||||
make_property_setter('Journal Entry', 'voucher_type', 'options', '\n'.join(journal_entry_types), '')
|
make_property_setter('Journal Entry', 'voucher_type', 'options', '\n'.join(journal_entry_types), '')
|
||||||
|
|
||||||
@@ -50,6 +53,18 @@ def execute():
|
|||||||
'itc_cess_amount')
|
'itc_cess_amount')
|
||||||
""")
|
""")
|
||||||
|
|
||||||
|
frappe.db.sql("""UPDATE `tabPurchase Invoice` set itc_integrated_tax = '0'
|
||||||
|
WHERE trim(coalesce(itc_integrated_tax, '')) = '' """)
|
||||||
|
|
||||||
|
frappe.db.sql("""UPDATE `tabPurchase Invoice` set itc_state_tax = '0'
|
||||||
|
WHERE trim(coalesce(itc_state_tax, '')) = '' """)
|
||||||
|
|
||||||
|
frappe.db.sql("""UPDATE `tabPurchase Invoice` set itc_central_tax = '0'
|
||||||
|
WHERE trim(coalesce(itc_central_tax, '')) = '' """)
|
||||||
|
|
||||||
|
frappe.db.sql("""UPDATE `tabPurchase Invoice` set itc_cess_amount = '0'
|
||||||
|
WHERE trim(coalesce(itc_cess_amount, '')) = '' """)
|
||||||
|
|
||||||
# Get purchase invoices
|
# Get purchase invoices
|
||||||
invoices = frappe.get_all('Purchase Invoice',
|
invoices = frappe.get_all('Purchase Invoice',
|
||||||
{'posting_date': ('>=', '2021-04-01'), 'eligibility_for_itc': ('!=', 'Ineligible')},
|
{'posting_date': ('>=', '2021-04-01'), 'eligibility_for_itc': ('!=', 'Ineligible')},
|
||||||
|
|||||||
@@ -193,13 +193,17 @@ def make_custom_fields(update=True):
|
|||||||
options='Input Service Distributor\nImport Of Service\nImport Of Capital Goods\nITC on Reverse Charge\nIneligible As Per Section 17(5)\nIneligible Others\nAll Other ITC',
|
options='Input Service Distributor\nImport Of Service\nImport Of Capital Goods\nITC on Reverse Charge\nIneligible As Per Section 17(5)\nIneligible Others\nAll Other ITC',
|
||||||
default="All Other ITC"),
|
default="All Other ITC"),
|
||||||
dict(fieldname='itc_integrated_tax', label='Availed ITC Integrated Tax',
|
dict(fieldname='itc_integrated_tax', label='Availed ITC Integrated Tax',
|
||||||
fieldtype='Data', insert_after='eligibility_for_itc', print_hide=1),
|
fieldtype='Currency', insert_after='eligibility_for_itc',
|
||||||
|
options='Company:company:default_currency', print_hide=1),
|
||||||
dict(fieldname='itc_central_tax', label='Availed ITC Central Tax',
|
dict(fieldname='itc_central_tax', label='Availed ITC Central Tax',
|
||||||
fieldtype='Data', insert_after='itc_integrated_tax', print_hide=1),
|
fieldtype='Currency', insert_after='itc_integrated_tax',
|
||||||
|
options='Company:company:default_currency', print_hide=1),
|
||||||
dict(fieldname='itc_state_tax', label='Availed ITC State/UT Tax',
|
dict(fieldname='itc_state_tax', label='Availed ITC State/UT Tax',
|
||||||
fieldtype='Data', insert_after='itc_central_tax', print_hide=1),
|
fieldtype='Currency', insert_after='itc_central_tax',
|
||||||
|
options='Company:company:default_currency', print_hide=1),
|
||||||
dict(fieldname='itc_cess_amount', label='Availed ITC Cess',
|
dict(fieldname='itc_cess_amount', label='Availed ITC Cess',
|
||||||
fieldtype='Data', insert_after='itc_state_tax', print_hide=1),
|
fieldtype='Currency', insert_after='itc_state_tax',
|
||||||
|
options='Company:company:default_currency', print_hide=1),
|
||||||
]
|
]
|
||||||
|
|
||||||
sales_invoice_gst_fields = [
|
sales_invoice_gst_fields = [
|
||||||
|
|||||||
Reference in New Issue
Block a user