Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix] Sales Order - get_query fix

Browse Source
This commit is contained in:
Anand Doshi 2015-09-24 11:32:31 +05:30
parent 361eca4cae
commit c6e4b5978d
2 changed files with 2478 additions and 2472 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/projects/doctype/project/project.js
View File

@ -59,9 +59,15 @@ cur_frm.fields_dict.customer.get_query = function(doc,cdt,cdn) {
} }
cur_frm.fields_dict['sales_order'].get_query = function(doc) { cur_frm.fields_dict['sales_order'].get_query = function(doc) {
var filters = {
'project_name': ["in", doc.__islocal ? [""] : [doc.name, ""]]
};
if (doc.customer) {
filters["customer"] = doc.customer;
}
return { return {
filters:{ filters: filters
'project_name': doc.name
}
} }
} }

4
erpnext/selling/doctype/sales_order/sales_order.json
View File

@ -364,7 +364,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Delivery Date", "label": "Delivery Date",
"no_copy": 0, "no_copy": 1,
"oldfieldname": "delivery_date", "oldfieldname": "delivery_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
"permlevel": 0, "permlevel": 0,
@ -2553,7 +2553,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-09-23 09:19:38.778717", "modified": "2015-09-23 10:19:38.778717",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Order", "name": "Sales Order",