schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge conflict fixed

Browse Source
This commit is contained in:
Akhilesh Darjee
2014-01-30 14:44:35 +05:30
parent 4cdb79941b fe8db590a1
commit e0a1039756
20 changed files with 500 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
erpnext/public/js/queries.js
View File

@@ -7,35 +7,35 @@ $.extend(erpnext.queries, {
profile: function() {
return { query: "webnotes.core.doctype.profile.profile.profile_query" };
},
lead: function() {
return { query: "erpnext.controllers.queries.lead_query" };
},
customer: function() {
return { query: "erpnext.controllers.queries.customer_query" };
},
supplier: function() {
return { query: "erpnext.controllers.queries.supplier_query" };
},
account: function() {
return { query: "erpnext.controllers.queries.account_query" };
},
item: function() {
return { query: "erpnext.controllers.queries.item_query" };
},
bom: function() {
return { query: "erpnext.controllers.queries.bom" };
},
task: function() {
return { query: "erpnext.projects.utils.query_task" };
},
customer_filter: function(doc) {
if(!doc.customer) {
wn.throw(wn._("Please specify a") + " " +
@@ -44,7 +44,7 @@ $.extend(erpnext.queries, {
return { filters: { customer: doc.customer } };
},
supplier_filter: function(doc) {
if(!doc.supplier) {
wn.throw(wn._("Please specify a") + " " +
@@ -53,9 +53,17 @@ $.extend(erpnext.queries, {
return { filters: { supplier: doc.supplier } };
},
lead_filter: function(doc) {
if(!doc.lead) {
wn.throw(wn._("Please specify a") + " " +
wn._(wn.meta.get_label(doc.doctype, "lead", doc.name)));
}
return { filters: { lead: doc.lead } };
},
not_a_group_filter: function() {
return { filters: { is_group: "No" } };
},
});