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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Nabin Hait 2017-05-23 17:48:43 +05:30
commit dce8dfc4fe
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -2,7 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
__version__ = '8.0.35' __version__ = '8.0.36'
def get_default_company(user=None): def get_default_company(user=None):

3
erpnext/accounts/page/pos/pos.js
View File

@ -361,7 +361,8 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
print_settings: this.print_settings, print_settings: this.print_settings,
header: this.letter_head.header, header: this.letter_head.header,
footer: this.letter_head.footer, footer: this.letter_head.footer,
landscape: false landscape: false,
columns: []
}) })
}, },