nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-06 13:49:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'version-12-hotfix' into mr_stopped_validation_v12

Browse Source
This commit is contained in:
Marica
2021-04-02 13:15:11 +05:30
committed by GitHub
parent 8d31d21b88 883598890d
commit 35c4a7a05d
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/regional/india/e_invoice/einv_validation.json
View File

@@ -919,7 +919,8 @@
"minLength": 1, "minLength": 1,
"maxLength": 15, "maxLength": 15,
"pattern": "^([0-9A-Z/-]){1,15}$", "pattern": "^([0-9A-Z/-]){1,15}$",
"description": "Tranport Document Number" "description": "Tranport Document Number",
"validationMsg": "Transport Receipt No is invalid"
}, },
"TransDocDt": { "TransDocDt": {
"type": "string", "type": "string",

7
erpnext/regional/india/e_invoice/utils.py
View File

@@ -328,8 +328,11 @@ def make_einvoice(invoice):
buyer_details = get_overseas_address_details(invoice.customer_address) buyer_details = get_overseas_address_details(invoice.customer_address)
else: else:
buyer_details = get_party_details(invoice.customer_address) buyer_details = get_party_details(invoice.customer_address)
place_of_supply = get_place_of_supply(invoice, invoice.doctype) or invoice.billing_address_gstin place_of_supply = get_place_of_supply(invoice, invoice.doctype)
place_of_supply = place_of_supply[:2] if place_of_supply:
place_of_supply = place_of_supply.split('-')[0]
else:
place_of_supply = sanitize_for_json(invoice.billing_address_gstin)[:2]
buyer_details.update(dict(place_of_supply=place_of_supply)) buyer_details.update(dict(place_of_supply=place_of_supply))
shipping_details = payment_details = prev_doc_details = eway_bill_details = frappe._dict({}) shipping_details = payment_details = prev_doc_details = eway_bill_details = frappe._dict({})