nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 19:19:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: reversing previous commits and adding condition in regional controller

Browse Source
This commit is contained in:
pateljannat
2020-11-18 12:51:13 +05:30
committed by Saurabh
parent 37a64b6485
commit 79ff4d0e8f
3 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/public/js/controllers/buying.js
View File

@@ -133,7 +133,6 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
supplier_address: function() { supplier_address: function() {
erpnext.utils.get_address_display(this.frm); erpnext.utils.get_address_display(this.frm);
erpnext.utils.set_taxes_from_address(this.frm, "supplier_address", "supplier_address", "supplier_address"); erpnext.utils.set_taxes_from_address(this.frm, "supplier_address", "supplier_address", "supplier_address");
erpnext.utils.set_place_of_supply(this.frm)
}, },
buying_price_list: function() { buying_price_list: function() {

13
erpnext/public/js/utils.js
View File

@@ -116,19 +116,6 @@ $.extend(erpnext.utils, {
} }
}, },
set_place_of_supply: function(frm){
frappe.call({
method: "erpnext.regional.india.utils.get_place_of_supply",
args: {
"party_details": frm.doc,
"doctype": frm.doc.doctype
},
callback: function(r){
frm.set_value("place_of_supply", r.message)
}
})
},
add_indicator_for_multicompany: function(frm, info) { add_indicator_for_multicompany: function(frm, info) {
frm.dashboard.stats_area.removeClass('hidden'); frm.dashboard.stats_area.removeClass('hidden');
frm.dashboard.stats_area_row.addClass('flex'); frm.dashboard.stats_area_row.addClass('flex');

3
erpnext/regional/india/utils.py
View File

@@ -144,9 +144,6 @@ def test_method():
def get_place_of_supply(party_details, doctype): def get_place_of_supply(party_details, doctype):
if not frappe.get_meta('Address').has_field('gst_state'): return if not frappe.get_meta('Address').has_field('gst_state'): return
if isinstance(party_details, string_types):
party_details = json.loads(party_details)
party_details = frappe._dict(party_details)
if doctype in ("Sales Invoice", "Delivery Note", "Sales Order"): if doctype in ("Sales Invoice", "Delivery Note", "Sales Order"):
address_name = party_details.customer_address or party_details.shipping_address_name address_name = party_details.customer_address or party_details.shipping_address_name