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

Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate

Browse Source
This commit is contained in:
Rushabh Mehta 2012-03-22 07:52:12 +01:00
commit 9af3911092
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/selling/doctype/lead/listview.js
View File

@ -4,9 +4,10 @@ wn.doclistviews['Lead'] = wn.views.ListView.extend({
this.fields = this.fields.concat([ this.fields = this.fields.concat([
'tabLead.lead_name', 'tabLead.lead_name',
'tabLead.status', 'tabLead.status',
'tabLead.source' 'tabLead.source',
'tabLead.rating'
]); ]);
this.stats = this.stats.concat(['status', 'source']); this.stats = this.stats.concat(['status', 'source', 'rating']);
}, },
prepare_data: function(data) { prepare_data: function(data) {
@ -17,14 +18,15 @@ wn.doclistviews['Lead'] = wn.views.ListView.extend({
else if(['Open', 'Attempted to Contact', 'Contacted', 'Contact in Future'].indexOf(data.status)!=-1) { else if(['Open', 'Attempted to Contact', 'Contacted', 'Contact in Future'].indexOf(data.status)!=-1) {
data.label_type = 'info' data.label_type = 'info'
} }
data.status_html = repl('<span class="label label-%(label_type)s">%(status)s</span>', data); data.status_html = repl('<span class="label label-%(label_type)s">%(status)s</span>', data);
data.lead_name = (data.rating ? ('['+data.rating+'] ') : '') + '['+data.source+'] ' + data.lead_name;
}, },
columns: [ columns: [
{width: '20%', content:'name'}, {width: '20%', content:'name'},
{width: '10%', content:'status_html'}, {width: '12%', content:'status_html'},
{width: '15%', content:'source'}, {width: '55%', content:'tags+lead_name', css: {color:'#aaa'}},
{width: '40%', content:'tags+lead_name', css: {color:'#aaa'}}, {width: '13%', content:'modified', css: {'text-align': 'right', 'color':'#777'}}
{width: '10%', content:'modified', css: {'text-align': 'right', 'color':'#777'}}
] ]
}) })

4
erpnext/support/doctype/support_ticket/listview.js
View File

@ -38,8 +38,8 @@ wn.doclistviews['Support Ticket'] = wn.views.ListView.extend({
columns: [ columns: [
{width: '20%', content:'name'}, {width: '20%', content:'name'},
{width: '10%', content:'status_html'}, {width: '10%', content:'status_html'},
{width: '60%', content:'tags+description', css: {color:'#aaa'}}, {width: '56%', content:'tags+description', css: {color:'#aaa'}},
{width: '10%', content:'modified', css: {'text-align': 'right', 'color':'#777'}} {width: '14%', content:'modified', css: {'text-align': 'right', 'color':'#777'}}
] ]
}); });