mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-26 16:34:46 +00:00
feat: Added fields for dispatch address in Sales Order, Sales Invoice, Delivery Note for Eway Bill
This commit is contained in:
@@ -431,9 +431,11 @@ def get_ewb_data(dt, dn):
|
||||
company_address = frappe.get_doc('Address', doc.company_address)
|
||||
billing_address = frappe.get_doc('Address', doc.customer_address)
|
||||
|
||||
#added dispatch address
|
||||
dispatch_address = frappe.get_doc('Address', doc.dispatch_address_name)
|
||||
shipping_address = frappe.get_doc('Address', doc.shipping_address_name)
|
||||
|
||||
data = get_address_details(data, doc, company_address, billing_address)
|
||||
data = get_address_details(data, doc, company_address, billing_address, dispatch_address)
|
||||
|
||||
data.itemList = []
|
||||
data.totalValue = doc.total
|
||||
@@ -519,10 +521,10 @@ def get_gstins_for_company(company):
|
||||
`tabDynamic Link`.link_name = %(company)s""", {"company": company})
|
||||
return company_gstins
|
||||
|
||||
def get_address_details(data, doc, company_address, billing_address):
|
||||
def get_address_details(data, doc, company_address, billing_address, dispatch_address):
|
||||
data.fromPincode = validate_pincode(company_address.pincode, 'Company Address')
|
||||
data.fromStateCode = data.actualFromStateCode = validate_state_code(
|
||||
company_address.gst_state_number, 'Company Address')
|
||||
data.fromStateCode = validate_state_code(company_address.gst_state_number, 'Company Address')
|
||||
data.actualFromStateCode = validate_state_code(dispatch_address.gst_state_number, 'Company Address')
|
||||
|
||||
if not doc.billing_address_gstin or len(doc.billing_address_gstin) < 15:
|
||||
data.toGstin = 'URP'
|
||||
|
||||
Reference in New Issue
Block a user