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

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2014-11-05 12:41:02 +05:30
parent 4a4125b3f4 5086ef2499
commit ae1dcabcb5
28 changed files with 252 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/support/doctype/customer_issue/customer_issue.js
View File

@@ -52,9 +52,14 @@ cur_frm.fields_dict['serial_no'].get_query = function(doc, cdt, cdn) {
['Serial No', 'docstatus', '!=', 2],
['Serial No', 'status', '=', "Delivered"]
];
if(doc.item_code) cond = ['Serial No', 'item_code', '=', doc.item_code];
if(doc.customer) cond = ['Serial No', 'customer', '=', doc.customer];
filter.push(cond);
if(doc.item_code) {
cond = ['Serial No', 'item_code', '=', doc.item_code];
filter.push(cond);
}
if(doc.customer) {
cond = ['Serial No', 'customer', '=', doc.customer];
filter.push(cond);
}
return{
filters:filter
}
@@ -97,4 +102,4 @@ cur_frm.cscript.company = function(doc, cdt, cdn) {
cur_frm.cscript.complaint_date = function(doc, cdt, cdn){
erpnext.get_fiscal_year(doc.company, doc.complaint_date);
}
}