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

Merge pull request #5466 from rohitwaghchaure/shipping_address_autocomplete_issue

Browse Source 
[Fix] Shipping address's get_query not working on autocomplete.
This commit is contained in:
Nabin Hait
2016-06-21 16:28:12 +05:30
committed by GitHub
parent 10ee3655d3 2dd26055c9
commit bf3e26dd2d
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
erpnext/buying/doctype/purchase_common/purchase_common.js
View File

@@ -14,6 +14,26 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
onload: function() { onload: function() {
this.setup_queries(); this.setup_queries();
this._super(); 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() { setup_queries: function() {
@@ -174,25 +194,6 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
shipping_address: function(){ shipping_address: function(){
var me = this; 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", erpnext.utils.get_address_display(this.frm, "shipping_address",
"shipping_address_display", is_your_company_address=true) "shipping_address_display", is_your_company_address=true)
} }