Merge branch 'master' into develop

2017-05-23 17:48:43 +05:30 · 2017-05-23 17:48:43 +05:30 · dce8dfc4fe
commit dce8dfc4fe
parent c9f5d84742 f8b412ba98
2 changed files with 3 additions and 2 deletions
--- a/erpnext/init.py
+++ b/erpnext/init.py
@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe

-__version__ = '8.0.35'
+__version__ = '8.0.36'


 def get_default_company(user=None):
--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@ -361,7 +361,8 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 			print_settings: this.print_settings,
 			header: this.letter_head.header,
 			footer: this.letter_head.footer,
-			landscape: false
+			landscape: false,
+			columns: []
 		})
 	},