Additional GST related fields in Invoice and Sales/Purchase Register reort (#10405)

2026-05-31 10:49:09 +00:00 · 2017-08-21 08:28:55 +05:30
parent 1f49f511aa
commit 879e162cce
15 changed files with 204 additions and 64 deletions
--- a/erpnext/regional/india/setup.py
+++ b/erpnext/regional/india/setup.py
@@ -81,6 +81,47 @@ def add_print_formats():
 def make_custom_fields():
 	hsn_sac_field = dict(fieldname='gst_hsn_code', label='HSN/SAC',
 		fieldtype='Data', options='item_code.gst_hsn_code', insert_after='description', print_hide=1)
+	invoice_gst_fields = [
+		dict(fieldname='gst_section', label='GST Details', fieldtype='Section Break',
+			insert_after='select_print_heading', print_hide=1, collapsible=1),
+		dict(fieldname='invoice_copy', label='Invoice Copy',
+			fieldtype='Select', insert_after='gst_section', print_hide=1, allow_on_submit=1,
+			options='Original for Recipient\nDuplicate for Transporter\nDuplicate for Supplier\nTriplicate for Supplier'),
+		dict(fieldname='reverse_charge', label='Reverse Charge',
+			fieldtype='Select', insert_after='invoice_copy', print_hide=1,
+			options='Y\nN', default='N'),
+		dict(fieldname='gst_col_break', fieldtype='Column Break', insert_after='reverse_charge'),
+		dict(fieldname='invoice_type', label='Invoice Type',
+			fieldtype='Select', insert_after='reverse_charge', print_hide=1,
+			options='Regular\nSEZ\nExport\nDeemed Export', default='Regular'),
+		dict(fieldname='export_type', label='Export Type',
+			fieldtype='Select', insert_after='invoice_type', print_hide=1,
+			depends_on='eval:in_list(["SEZ", "Export", "Deemed Export"], doc.invoice_type)',
+			options='\nWith Payment of Tax\nWithout Payment of Tax'),
+		dict(fieldname='ecommerce_gstin', label='E-commerce GSTIN',
+			fieldtype='Data', insert_after='export_type', print_hide=1)
+	]
+	
+	purchase_invoice_gst_fields = [
+			dict(fieldname='supplier_gstin', label='Supplier GSTIN',
+				fieldtype='Data', insert_after='supplier_address',
+				options='supplier_address.gstin', print_hide=1),
+			dict(fieldname='company_gstin', label='Company GSTIN',
+				fieldtype='Data', insert_after='shipping_address',
+				options='shipping_address.gstin', print_hide=1)
+		]
+		
+	sales_invoice_gst_fields = [
+			dict(fieldname='customer_gstin', label='Customer GSTIN',
+				fieldtype='Data', insert_after='shipping_address',
+				options='shipping_address_name.gstin', print_hide=1),
+			dict(fieldname='place_of_supply', label='Place of Supply',
+				fieldtype='Data', insert_after='customer_gstin', print_hide=1,
+				options='shipping_address_name.gst_state_number', read_only=1),
+			dict(fieldname='company_gstin', label='Company GSTIN',
+				fieldtype='Data', insert_after='company_address',
+				options='company_address.gstin', print_hide=1)
+		]
 	
 	custom_fields = {
 		'Address': [
@@ -91,25 +132,9 @@ def make_custom_fields():
 			dict(fieldname='gst_state_number', label='GST State Number',
 				fieldtype='Int', insert_after='gst_state', read_only=1),
 		],
-		'Purchase Invoice': [
-			dict(fieldname='supplier_gstin', label='Supplier GSTIN',
-				fieldtype='Data', insert_after='supplier_address',
-				options='supplier_address.gstin', print_hide=1),
-			dict(fieldname='company_gstin', label='Company GSTIN',
-				fieldtype='Data', insert_after='shipping_address',
-				options='shipping_address.gstin', print_hide=1),
-		],
-		'Sales Invoice': [
-			dict(fieldname='customer_gstin', label='Customer GSTIN',
-				fieldtype='Data', insert_after='shipping_address',
-				options='shipping_address_name.gstin', print_hide=1),
-			dict(fieldname='company_gstin', label='Company GSTIN',
-				fieldtype='Data', insert_after='company_address',
-				options='company_address.gstin', print_hide=1),
-			dict(fieldname='invoice_copy', label='Invoice Copy',
-				fieldtype='Select', insert_after='select_print_heading', print_hide=1, allow_on_submit=1,
-				options='Original for Recipient\nDuplicate for Transporter\nDuplicate for Supplier\nTriplicate for Supplier')
-		],
+		'Purchase Invoice': purchase_invoice_gst_fields + invoice_gst_fields,
+		'Sales Invoice': sales_invoice_gst_fields + invoice_gst_fields,
+		"Delivery Note": sales_invoice_gst_fields,
 		'Item': [
 			dict(fieldname='gst_hsn_code', label='HSN/SAC',
 				fieldtype='Link', options='GST HSN Code', insert_after='item_group'),
--- a/erpnext/regional/report/gst_itemised_purchase_register/gst_itemised_purchase_register.py
+++ b/erpnext/regional/report/gst_itemised_purchase_register/gst_itemised_purchase_register.py
@@ -9,9 +9,17 @@ def execute(filters=None):
 	return _execute(filters, additional_table_columns=[
 		dict(fieldtype='Data', label='Supplier GSTIN', width=120),
 		dict(fieldtype='Data', label='Company GSTIN', width=120),
+		dict(fieldtype='Data', label='Reverse Charge', width=120),
+		dict(fieldtype='Data', label='Invoice Type', width=120),
+		dict(fieldtype='Data', label='Export Type', width=120),
+		dict(fieldtype='Data', label='E-Commerce GSTIN', width=130),
 		dict(fieldtype='Data', label='HSN Code', width=120)
 	], additional_query_columns=[
 		'supplier_gstin',
 		'company_gstin',
+		'reverse_charge',
+		'invoice_type',
+		'export_type',
+		'ecommerce_gstin',
 		'gst_hsn_code'
 	])
--- a/erpnext/regional/report/gst_itemised_sales_register/gst_itemised_sales_register.py
+++ b/erpnext/regional/report/gst_itemised_sales_register/gst_itemised_sales_register.py
@@ -9,9 +9,19 @@ def execute(filters=None):
 	return _execute(filters, additional_table_columns=[
 		dict(fieldtype='Data', label='Customer GSTIN', width=120),
 		dict(fieldtype='Data', label='Company GSTIN', width=120),
+		dict(fieldtype='Data', label='Place of Supply', width=120),
+		dict(fieldtype='Data', label='Reverse Charge', width=120),
+		dict(fieldtype='Data', label='Invoice Type', width=120),
+		dict(fieldtype='Data', label='Export Type', width=120),
+		dict(fieldtype='Data', label='E-Commerce GSTIN', width=130),
 		dict(fieldtype='Data', label='HSN Code', width=120)
 	], additional_query_columns=[
 		'customer_gstin',
 		'company_gstin',
+		'place_of_supply',
+		'reverse_charge',
+		'invoice_type',
+		'export_type',
+		'ecommerce_gstin',
 		'gst_hsn_code'
 	])
--- a/erpnext/regional/report/gst_purchase_register/gst_purchase_register.py
+++ b/erpnext/regional/report/gst_purchase_register/gst_purchase_register.py
@@ -8,9 +8,17 @@ from erpnext.accounts.report.purchase_register.purchase_register import _execute
 def execute(filters=None):
 	return _execute(filters, additional_table_columns=[
 		dict(fieldtype='Data', label='Supplier GSTIN', width=120),
-		dict(fieldtype='Data', label='Company GSTIN', width=120)
+		dict(fieldtype='Data', label='Company GSTIN', width=120),
+		dict(fieldtype='Data', label='Reverse Charge', width=120),
+		dict(fieldtype='Data', label='Invoice Type', width=120),
+		dict(fieldtype='Data', label='Export Type', width=120),
+		dict(fieldtype='Data', label='E-Commerce GSTIN', width=130)
 	], additional_query_columns=[
 		'supplier_gstin',
-		'company_gstin'
+		'company_gstin',
+		'reverse_charge',
+		'invoice_type',
+		'export_type',
+		'ecommerce_gstin'
 	])

--- a/erpnext/regional/report/gst_sales_register/gst_sales_register.py
+++ b/erpnext/regional/report/gst_sales_register/gst_sales_register.py
@@ -8,8 +8,18 @@ from erpnext.accounts.report.sales_register.sales_register import _execute
 def execute(filters=None):
 	return _execute(filters, additional_table_columns=[
 		dict(fieldtype='Data', label='Customer GSTIN', width=120),
-		dict(fieldtype='Data', label='Company GSTIN', width=120)
+		dict(fieldtype='Data', label='Company GSTIN', width=120),
+		dict(fieldtype='Data', label='Place of Supply', width=120),
+		dict(fieldtype='Data', label='Reverse Charge', width=120),
+		dict(fieldtype='Data', label='Invoice Type', width=120),
+		dict(fieldtype='Data', label='Export Type', width=120),
+		dict(fieldtype='Data', label='E-Commerce GSTIN', width=130)
 	], additional_query_columns=[
 		'customer_gstin',
-		'company_gstin'
+		'company_gstin',
+		'place_of_supply',
+		'reverse_charge',
+		'invoice_type',
+		'export_type',
+		'ecommerce_gstin'
 	])