mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-01 11:19:09 +00:00
fix: added gst fields,warehouse validation to pos inv,patch
This commit is contained in:
@@ -40,6 +40,7 @@ class POSInvoice(SalesInvoice):
|
|||||||
self.validate_change_amount()
|
self.validate_change_amount()
|
||||||
self.validate_change_account()
|
self.validate_change_account()
|
||||||
self.validate_item_cost_centers()
|
self.validate_item_cost_centers()
|
||||||
|
self.validate_warehouse()
|
||||||
self.validate_serialised_or_batched_item()
|
self.validate_serialised_or_batched_item()
|
||||||
self.validate_stock_availablility()
|
self.validate_stock_availablility()
|
||||||
self.validate_return_items_qty()
|
self.validate_return_items_qty()
|
||||||
|
|||||||
@@ -314,3 +314,4 @@ erpnext.patches.v13_0.create_website_items
|
|||||||
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.gst_fields_for_pos_invoice
|
||||||
|
|||||||
44
erpnext/patches/v13_0/gst_fields_for_pos_invoice.py
Normal file
44
erpnext/patches/v13_0/gst_fields_for_pos_invoice.py
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
import frappe
|
||||||
|
from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
|
||||||
|
|
||||||
|
|
||||||
|
def execute():
|
||||||
|
company = frappe.get_all('Company', filters = {'country': 'India'}, fields=['name'])
|
||||||
|
if not company:
|
||||||
|
return
|
||||||
|
|
||||||
|
hsn_sac_field = dict(fieldname='gst_hsn_code', label='HSN/SAC',
|
||||||
|
fieldtype='Data', fetch_from='item_code.gst_hsn_code', insert_after='description',
|
||||||
|
allow_on_submit=1, print_hide=1, fetch_if_empty=1)
|
||||||
|
nil_rated_exempt = dict(fieldname='is_nil_exempt', label='Is Nil Rated or Exempted',
|
||||||
|
fieldtype='Check', fetch_from='item_code.is_nil_exempt', insert_after='gst_hsn_code',
|
||||||
|
print_hide=1)
|
||||||
|
is_non_gst = dict(fieldname='is_non_gst', label='Is Non GST',
|
||||||
|
fieldtype='Check', fetch_from='item_code.is_non_gst', insert_after='is_nil_exempt',
|
||||||
|
print_hide=1)
|
||||||
|
taxable_value = dict(fieldname='taxable_value', label='Taxable Value',
|
||||||
|
fieldtype='Currency', insert_after='base_net_amount', hidden=1, options="Company:company:default_currency",
|
||||||
|
print_hide=1)
|
||||||
|
sales_invoice_gst_fields = [
|
||||||
|
dict(fieldname='billing_address_gstin', label='Billing Address GSTIN',
|
||||||
|
fieldtype='Data', insert_after='customer_address', read_only=1,
|
||||||
|
fetch_from='customer_address.gstin', print_hide=1),
|
||||||
|
dict(fieldname='customer_gstin', label='Customer GSTIN',
|
||||||
|
fieldtype='Data', insert_after='shipping_address_name',
|
||||||
|
fetch_from='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, read_only=1),
|
||||||
|
dict(fieldname='company_gstin', label='Company GSTIN',
|
||||||
|
fieldtype='Data', insert_after='company_address',
|
||||||
|
fetch_from='company_address.gstin', print_hide=1, read_only=1),
|
||||||
|
]
|
||||||
|
|
||||||
|
custom_fields = {
|
||||||
|
'POS Invoice': sales_invoice_gst_fields,
|
||||||
|
'POS Invoice Item': [hsn_sac_field, nil_rated_exempt, is_non_gst, taxable_value],
|
||||||
|
}
|
||||||
|
|
||||||
|
create_custom_fields(custom_fields, update=True)
|
||||||
@@ -530,6 +530,7 @@ def make_custom_fields(update=True):
|
|||||||
'Purchase Order': purchase_invoice_gst_fields,
|
'Purchase Order': purchase_invoice_gst_fields,
|
||||||
'Purchase Receipt': purchase_invoice_gst_fields,
|
'Purchase Receipt': purchase_invoice_gst_fields,
|
||||||
'Sales Invoice': sales_invoice_gst_category + invoice_gst_fields + sales_invoice_shipping_fields + sales_invoice_gst_fields + si_ewaybill_fields + si_einvoice_fields,
|
'Sales Invoice': sales_invoice_gst_category + invoice_gst_fields + sales_invoice_shipping_fields + sales_invoice_gst_fields + si_ewaybill_fields + si_einvoice_fields,
|
||||||
|
'POS Invoice': sales_invoice_gst_fields,
|
||||||
'Delivery Note': sales_invoice_gst_fields + ewaybill_fields + sales_invoice_shipping_fields + delivery_note_gst_category,
|
'Delivery Note': sales_invoice_gst_fields + ewaybill_fields + sales_invoice_shipping_fields + delivery_note_gst_category,
|
||||||
'Payment Entry': payment_entry_fields,
|
'Payment Entry': payment_entry_fields,
|
||||||
'Journal Entry': journal_entry_fields,
|
'Journal Entry': journal_entry_fields,
|
||||||
@@ -548,6 +549,7 @@ def make_custom_fields(update=True):
|
|||||||
'Sales Order Item': [hsn_sac_field, nil_rated_exempt, is_non_gst],
|
'Sales Order Item': [hsn_sac_field, nil_rated_exempt, is_non_gst],
|
||||||
'Delivery Note Item': [hsn_sac_field, nil_rated_exempt, is_non_gst],
|
'Delivery Note Item': [hsn_sac_field, nil_rated_exempt, is_non_gst],
|
||||||
'Sales Invoice Item': [hsn_sac_field, nil_rated_exempt, is_non_gst, taxable_value],
|
'Sales Invoice Item': [hsn_sac_field, nil_rated_exempt, is_non_gst, taxable_value],
|
||||||
|
'POS Invoice Item': [hsn_sac_field, nil_rated_exempt, is_non_gst, taxable_value],
|
||||||
'Purchase Order Item': [hsn_sac_field, nil_rated_exempt, is_non_gst],
|
'Purchase Order Item': [hsn_sac_field, nil_rated_exempt, is_non_gst],
|
||||||
'Purchase Receipt Item': [hsn_sac_field, nil_rated_exempt, is_non_gst],
|
'Purchase Receipt Item': [hsn_sac_field, nil_rated_exempt, is_non_gst],
|
||||||
'Purchase Invoice Item': [hsn_sac_field, nil_rated_exempt, is_non_gst, taxable_value],
|
'Purchase Invoice Item': [hsn_sac_field, nil_rated_exempt, is_non_gst, taxable_value],
|
||||||
|
|||||||
Reference in New Issue
Block a user