diff --git a/erpnext/buying/doctype/supplier/listview.js b/erpnext/buying/doctype/supplier/listview.js
index 2bd4b121e9..6f9a356a59 100644
--- a/erpnext/buying/doctype/supplier/listview.js
+++ b/erpnext/buying/doctype/supplier/listview.js
@@ -11,13 +11,14 @@ wn.doclistviews['Supplier'] = wn.views.ListView.extend({
prepare_data: function(data) {
this._super(data);
+ data.supplier_name = repl("%(supplier_name)s",
+ data);
},
columns: [
{width: '3%', content: 'check'},
{width: '5%', content:'avatar'},
- {width: '20%', content:'name'},
- {width: '30%', content:'supplier_name'},
+ {width: '50%', content:'supplier_name'},
{width: '10%', content:'tags'},
{width: '20%', content:'supplier_type', css: {'color': '#aaa'}},
{width: '12%', content:'modified', css: {'text-align': 'right', 'color':'#777'}}
diff --git a/erpnext/selling/doctype/communication_log/__init__.py b/erpnext/selling/doctype/communication_log/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/erpnext/selling/doctype/communication_log/communication_log.txt b/erpnext/selling/doctype/communication_log/communication_log.txt
deleted file mode 100644
index f5ea6be72e..0000000000
--- a/erpnext/selling/doctype/communication_log/communication_log.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-# DocType, Communication Log
-[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:36:09',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:36:09',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all DocType
- {
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'istable': 1,
- 'module': u'Selling',
- 'name': '__common__',
- 'section_style': u'Tray',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'version': 10
- },
-
- # These values are common for all DocField
- {
- 'allow_on_submit': 1,
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Communication Log',
- 'parentfield': u'fields',
- 'parenttype': u'DocType',
- 'permlevel': 0
- },
-
- # DocType, Communication Log
- {
- 'doctype': 'DocType',
- 'name': u'Communication Log'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'date',
- 'fieldtype': u'Date',
- 'in_filter': 1,
- 'label': u'Date',
- 'oldfieldname': u'date',
- 'oldfieldtype': u'Date'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'notes',
- 'fieldtype': u'Small Text',
- 'in_filter': 0,
- 'label': u'Notes',
- 'oldfieldname': u'notes',
- 'oldfieldtype': u'Small Text',
- 'width': u'300px'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'follow_up_type',
- 'fieldtype': u'Select',
- 'in_filter': 1,
- 'label': u'Communication type',
- 'oldfieldname': u'follow_up_type',
- 'oldfieldtype': u'Select',
- 'options': u'\nPhone\nEmail\nSMS\nVisit\nOther'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'follow_up_by',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'Communication by',
- 'oldfieldname': u'follow_up_by',
- 'oldfieldtype': u'Link',
- 'options': u'Sales Person'
- }
-]
\ No newline at end of file
diff --git a/erpnext/selling/doctype/customer/listview.js b/erpnext/selling/doctype/customer/listview.js
index 8543293318..133beac67a 100644
--- a/erpnext/selling/doctype/customer/listview.js
+++ b/erpnext/selling/doctype/customer/listview.js
@@ -9,12 +9,20 @@ wn.doclistviews['Customer'] = wn.views.ListView.extend({
this.show_hide_check_column();
},
+ prepare_data: function(data) {
+ this._super(data);
+ data.customer_name = repl("%(customer_name)s",
+ data);
+ },
+
columns: [
{width: '3%', content:'check'},
{width: '5%', content:'avatar'},
- {width: '50%', content:'name'},
+ {width: '50%', content:'customer_name'},
{width: '10%', content:'tags'},
- {width: '20%', content:'territory', css: {'color': '#aaa'}},
- {width: '12%', content:'modified', css: {'text-align': 'right', 'color':'#777'}}
- ]
+ {width: '20%', content:'territory',
+ css: {'color': '#aaa'}},
+ {width: '12%', content:'modified',
+ css: {'text-align': 'right', 'color':'#777'}}
+ ],
});
diff --git a/erpnext/selling/doctype/lead/listview.js b/erpnext/selling/doctype/lead/listview.js
index 7088b3532c..ca18dc6941 100644
--- a/erpnext/selling/doctype/lead/listview.js
+++ b/erpnext/selling/doctype/lead/listview.js
@@ -19,15 +19,17 @@ wn.doclistviews['Lead'] = wn.views.ListView.extend({
data.label_type = 'info'
}
data.status_html = repl('%(status)s', data);
-
- data.lead_name = (data.rating ? ('['+data.rating+'] ') : '') + '['+data.source+'] ' + data.lead_name;
+ data.lead_name = repl("%(lead_name)s",
+ data);
+ data.lead_status = (data.rating ? ('['+data.rating+'] ') : '') + '['+data.source+']';
},
columns: [
{width: '3%', content: 'check'},
- {width: '20%', content:'name'},
+ {width: '5%', content:'avatar'},
+ {width: '30%', content:'lead_name'},
{width: '12%', content:'status_html'},
- {width: '52%', content:'lead_name+tags', css: {color:'#222'}},
- {width: '13%', content:'modified', css: {'text-align': 'right', 'color':'#777'}}
+ {width: '38%', content:'lead_status+tags', css: {color:'#222'}},
+ {width: '12%', content:'modified', css: {'text-align': 'right', 'color':'#777'}}
]
})