Merge pull request #5466 from rohitwaghchaure/shipping_address_autocomplete_issue
[Fix] Shipping address's get_query not working on autocomplete.
diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js
index c67a30f..9b316e4 100644
--- a/erpnext/buying/doctype/purchase_common/purchase_common.js
+++ b/erpnext/buying/doctype/purchase_common/purchase_common.js
@@ -14,6 +14,26 @@
onload: function() {
this.setup_queries();
this._super();
+
+ if(this.frm.get_field('shipping_address')) {
+ this.frm.set_query("shipping_address", function(){
+ if(me.frm.doc.customer){
+ return{
+ filters:{
+ "customer": me.frm.doc.customer
+ }
+ }
+ }
+ else{
+ return{
+ filters:{
+ "is_your_company_address": 1,
+ "company": me.frm.doc.company
+ }
+ }
+ }
+ });
+ }
},
setup_queries: function() {
@@ -174,25 +194,6 @@
shipping_address: function(){
var me = this;
-
- this.frm.set_query("shipping_address", function(){
- if(me.frm.doc.customer){
- return{
- filters:{
- "customer": me.frm.doc.customer
- }
- }
- }
- else{
- return{
- filters:{
- "is_your_company_address": 1,
- "company": me.frm.doc.company
- }
- }
- }
- });
-
erpnext.utils.get_address_display(this.frm, "shipping_address",
"shipping_address_display", is_your_company_address=true)
}