Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
diff --git a/erpnext/accounts/doctype/sales_invoice/listview.js b/erpnext/accounts/doctype/sales_invoice/listview.js
index f3548f0..c8030ef 100644
--- a/erpnext/accounts/doctype/sales_invoice/listview.js
+++ b/erpnext/accounts/doctype/sales_invoice/listview.js
@@ -1,7 +1,7 @@
// render
wn.doclistviews['Sales Invoice'] = wn.views.ListView.extend({
init: function(d) {
- this._super(d)
+ this._super(d);
this.fields = this.fields.concat([
"`tabSales Invoice`.customer_name",
"ifnull(`tabSales Invoice`.outstanding_amount,0) as outstanding_amount",
diff --git a/erpnext/selling/doctype/customer/listview.js b/erpnext/selling/doctype/customer/listview.js
index 3ac705a..8543293 100644
--- a/erpnext/selling/doctype/customer/listview.js
+++ b/erpnext/selling/doctype/customer/listview.js
@@ -6,11 +6,13 @@
"`tabCustomer`.customer_name",
"`tabCustomer`.territory",
]);
+ this.show_hide_check_column();
},
columns: [
+ {width: '3%', content:'check'},
{width: '5%', content:'avatar'},
- {width: '53%', content:'name'},
+ {width: '50%', content:'name'},
{width: '10%', content:'tags'},
{width: '20%', content:'territory', css: {'color': '#aaa'}},
{width: '12%', content:'modified', css: {'text-align': 'right', 'color':'#777'}}