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:40:58 +01:00
commit e9f7e6c949
6 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/all-app.css
View File

@ -3479,7 +3479,7 @@ span, div, td, input, textarea, button, select {
}
body {
background: url(../lib/images/ui/redbeech.jpg) repeat;
background: url(../images/redbeech.jpg) repeat;
}
.small {

2
css/all-web.css
View File

@ -1619,7 +1619,7 @@ span, div, td, input, textarea, button, select {
}
body {
background: url(../lib/images/ui/redbeech.jpg) repeat;
background: url(../images/redbeech.jpg) repeat;
}
.small {

30
erpnext/selling/doctype/lead/listview.js Normal file
View File

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

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

@ -31,14 +31,13 @@ wn.doclistviews['Support Ticket'] = wn.views.ListView.extend({
// description
if(data.description && data.description.length > 50) {
data.description = '<span title="'+data.description+'">' + data.description.substr(0,30) + '...</span>';
data.description = '<span title="'+data.description+'">' + data.description.substr(0,50) + '...</span>';
}
},
columns: [
{width: '3%', content:'docstatus'},
{width: '15%', content:'name'},
{width: '8%', content:'status_html'},
{width: '20%', content:'name'},
{width: '10%', content:'status_html'},
{width: '60%', content:'tags+description', css: {color:'#aaa'}},
{width: '10%', content:'modified', css: {'text-align': 'right', 'color':'#777'}}
]

3
js/all-app.js
View File

@ -1857,7 +1857,8 @@ _f.Grid.prototype.hide=function(){$dh(this.wrapper);$dh(this.tbar_div);}
_f.Grid.prototype.insert_column=function(doctype,fieldname,fieldtype,label,width,options,perm,reqd){var idx=this.head_row.cells.length;if(!width)width='100px';if((width+'').slice(-2)!='px'){width=width+'px';}
var col=this.head_row.insertCell(idx);col.doctype=doctype;col.fieldname=fieldname;col.fieldtype=fieldtype;col.innerHTML='<div data-grid-fieldname = "'+doctype+'-'+fieldname+'">'+label+'</div>';col.label=label;if(reqd)
col.childNodes[0].style.color="#D22";col.style.width=width;col.options=options;col.perm=perm;this.col_idx_by_name[fieldname]=idx;}
_f.Grid.prototype.reset_table_width=function(){var w=0;for(var i=0,len=this.head_row.cells.length;i<len;i++){w+=cint(this.head_row.cells[i].style.width);}
_f.Grid.prototype.reset_table_width=function(){var w=0;$.each(this.head_row.cells,function(i,cell){if((cell.style.display||'').toLowerCase()!='none')
w+=cint(cell.style.width);})
this.head_tab.style.width=w+'px';this.tab.style.width=w+'px';}
_f.Grid.prototype.set_column_disp=function(fieldname,show){var cidx=this.col_idx_by_name[fieldname];if(!cidx){msgprint('Trying to hide unknown column: '+fieldname);return;}
var disp=show?'table-cell':'none';this.head_row.cells[cidx].style.display=disp;for(var i=0,len=this.tab.rows.length;i<len;i++){var cell=this.tab.rows[i].cells[cidx];cell.style.display=disp;}

2
version.num
View File

@ -1 +1 @@
1339
1340